changeset 2512:54dde9f9887d

Merge
author andrew
date Mon, 21 Dec 2009 12:19:57 +0000
parents 6b9522825101 e703499b4b51
children b99941b82205
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Dec 04 15:28:51 2009 +0000
+++ b/.hgignore	Mon Dec 21 12:19:57 2009 +0000
@@ -1,6 +1,6 @@
 ^build/
 ^dist/
-^nbproject/private/
+/nbproject/private/
 ^src/share/tools/hsdis/build/
 ^src/share/tools/IdealGraphVisualizer/[a-zA-Z0-9]*/build/
 ^src/share/tools/IdealGraphVisualizer/build/
--- a/.hgtags	Fri Dec 04 15:28:51 2009 +0000
+++ b/.hgtags	Mon Dec 21 12:19:57 2009 +0000
@@ -52,3 +52,4 @@
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
 b4ab978ce52c41bb7e8ee86285e6c9f28122bbe1 icedtea7-1.12
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77