Mercurial > hg > truffle

changeset 1114:9749fbc4859b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Wed, 23 Dec 2009 02:57:31 -0800
parents 920875ae1277 (diff) 7ac7d558e895 (current diff)
children a5a6adfca6ec
files
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Dec 23 00:47:04 2009 -0800
+++ b/.hgignore	Wed Dec 23 02:57:31 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	Wed Dec 23 00:47:04 2009 -0800
+++ b/.hgtags	Wed Dec 23 02:57:31 2009 -0800
@@ -50,3 +50,6 @@
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
 d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
+9174bb32e934965288121f75394874eeb1fcb649 jdk7-b76
+455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
+e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
--- a/make/hotspot_version	Wed Dec 23 00:47:04 2009 -0800
+++ b/make/hotspot_version	Wed Dec 23 02:57:31 2009 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7