Mercurial > hg > truffle

changeset 316:5fa96a5a7e76 jdk7-b35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Thu, 04 Sep 2008 18:40:43 -0700
parents 5c7c20a84e41 (diff) 3a26e9e4be71 (current diff)
children 51798f0e554f f9847b70eccd 24fc405437c9 f8199438385b
files src/cpu/x86/vm/assembler_x86_32.cpp src/cpu/x86/vm/assembler_x86_32.hpp src/cpu/x86/vm/assembler_x86_32.inline.hpp src/cpu/x86/vm/assembler_x86_64.cpp src/cpu/x86/vm/assembler_x86_64.hpp src/cpu/x86/vm/assembler_x86_64.inline.hpp src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp src/os_cpu/solaris_x86/vm/assembler_solaris_x86_32.cpp src/os_cpu/solaris_x86/vm/assembler_solaris_x86_64.cpp src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp src/os_cpu/windows_x86/vm/assembler_windows_x86_64.cpp
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 03 14:57:00 2008 -0700
+++ b/.hgtags	Thu Sep 04 18:40:43 2008 -0700
@@ -8,3 +8,4 @@
 9c2ecc2ffb125f14fab3857fe7689598956348a0 jdk7-b31
 b727c32788a906c04839516ae7443a085185a300 jdk7-b32
 585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33
+5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34
--- a/make/hotspot_version	Wed Sep 03 14:57:00 2008 -0700
+++ b/make/hotspot_version	Thu Sep 04 18:40:43 2008 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=14
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7