changeset 1098:61b46f7853d4

Merge
author trims
date Tue, 22 Dec 2009 16:32:11 -0800
parents 74e00f62c726 1cf572922ff1
children 22e4972db0a6
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Dec 11 16:38:37 2009 -0800
+++ b/.hgignore	Tue Dec 22 16:32:11 2009 -0800
@@ -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 11 16:38:37 2009 -0800
+++ b/.hgtags	Tue Dec 22 16:32:11 2009 -0800
@@ -52,3 +52,4 @@
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78