aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrims <none@none>2010-02-05 12:26:35 -0800
committertrims <none@none>2010-02-05 12:26:35 -0800
commite074f9c9e717120a923c4edfa2209dd71777f625 (patch)
tree35691dfe5f4dcac6e2ef0a6395142fd0ff475999
parent5237fdcace2bbb38e37c10f83128b506ecac782e (diff)
parentd720a6be2bcfdc3f3e9e04c51b7144b87296057e (diff)
Merge
-rw-r--r--.hgtags2
-rw-r--r--make/hotspot_version2
2 files changed, 3 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index a8a8db0f2..687370f73 100644
--- a/.hgtags
+++ b/.hgtags
@@ -54,3 +54,5 @@ d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
+3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
+1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81
diff --git a/make/hotspot_version b/make/hotspot_version
index 103051faf..4dfc3baf7 100644
--- a/make/hotspot_version
+++ b/make/hotspot_version
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2009
HS_MAJOR_VER=17
HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=08
JDK_MAJOR_VER=1
JDK_MINOR_VER=7