Merge

4de17e95 · trims · da05c850 · 91141f79 · 4de17e95 · 4de17e95
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

.hgignore .hgignore +1 -1

.hgtags .hgtags +1 -0

未找到文件。
--- a/.hgignore
+++ b/.hgignore
 ^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
+++ b/.hgtags
@@ -52,3 +52,4 @@ f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
 9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78