Mercurial > hg > truffle

changeset 10989:726d2d4913fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author nloodin
date Wed, 19 Jun 2013 18:13:52 +0200
parents f9709e27a876 (diff) cd54c7e92908 (current diff)
children 9f9c0a163cc5
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 18 09:08:35 2013 -0700
+++ b/.hgtags	Wed Jun 19 18:13:52 2013 +0200
@@ -349,3 +349,5 @@
 573d86d412cd9d3df7912194c1a540be50e9544e jdk8-b93
 b786c04b7be15194febe88dc1f0c9443e737a84b hs25-b35
 3c78a14da19d26d6937af5f98b97e2a21c653b04 hs25-b36
+1beed1f6f9edefe47ba8ed1355fbd3e7606b8288 jdk8-b94
+69689078dff8b21e6df30870464f5d736eebdf72 hs25-b37
--- a/make/hotspot_version	Tue Jun 18 09:08:35 2013 -0700
+++ b/make/hotspot_version	Wed Jun 19 18:13:52 2013 +0200
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=37
+HS_BUILD_NUMBER=38
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8