Mercurial > hg > truffle

changeset 1997:505c913f22f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 10 Dec 2010 17:59:46 -0800
parents 058f494c8b6d (diff) f0ef5f5a460f (current diff)
children 0d4395745860
files make/linux/makefiles/makedeps.make make/solaris/makefiles/makedeps.make make/windows/README make/windows/makefiles/makedeps.make src/os/linux/launcher/java.c src/os/linux/launcher/java.h src/os/linux/launcher/java_md.c src/os/linux/launcher/java_md.h src/os/linux/vm/hpi_linux.cpp src/os/linux/vm/hpi_linux.hpp src/os/solaris/launcher/java.c src/os/solaris/launcher/java.h src/os/solaris/launcher/java_md.c src/os/solaris/launcher/java_md.h src/os/solaris/vm/hpi_solaris.cpp src/os/solaris/vm/hpi_solaris.hpp src/os/windows/vm/hpi_windows.cpp src/os/windows/vm/hpi_windows.hpp src/share/tools/MakeDeps/ArgsParser.java src/share/tools/MakeDeps/BuildConfig.java src/share/tools/MakeDeps/Database.java src/share/tools/MakeDeps/DirectoryTree.java src/share/tools/MakeDeps/DirectoryTreeNode.java src/share/tools/MakeDeps/FileFormatException.java src/share/tools/MakeDeps/FileList.java src/share/tools/MakeDeps/FileName.java src/share/tools/MakeDeps/Macro.java src/share/tools/MakeDeps/MacroDefinitions.java src/share/tools/MakeDeps/MakeDeps.java src/share/tools/MakeDeps/MetroWerksMacPlatform.java src/share/tools/MakeDeps/Platform.java src/share/tools/MakeDeps/UnixPlatform.java src/share/tools/MakeDeps/Util.java src/share/tools/MakeDeps/WinGammaPlatform.java src/share/tools/MakeDeps/WinGammaPlatformVC6.java src/share/tools/MakeDeps/WinGammaPlatformVC7.java src/share/tools/MakeDeps/WinGammaPlatformVC8.java src/share/tools/MakeDeps/WinGammaPlatformVC9.java src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep src/share/vm/gc_implementation/includeDB_gc_g1 src/share/vm/gc_implementation/includeDB_gc_parNew src/share/vm/gc_implementation/includeDB_gc_parallelScavenge src/share/vm/gc_implementation/includeDB_gc_serial src/share/vm/gc_implementation/includeDB_gc_shared src/share/vm/includeDB_compiler1 src/share/vm/includeDB_compiler2 src/share/vm/includeDB_core src/share/vm/includeDB_features src/share/vm/includeDB_gc src/share/vm/includeDB_gc_parallel src/share/vm/includeDB_jvmti src/share/vm/includeDB_shark src/share/vm/includeDB_zero src/share/vm/prims/hpi_imported.h src/share/vm/runtime/hpi.cpp src/share/vm/runtime/hpi.hpp
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 09 21:47:58 2010 -0800
+++ b/.hgtags	Fri Dec 10 17:59:46 2010 -0800
@@ -131,3 +131,7 @@
 806d0c037e6bbb88dac0699673f4ba55ee8c02da jdk7-b117
 698b7b727e12de44139d8cca6ab9a494ead13253 jdk7-b118
 3ef7426b4deac5dcfd4afb35cabe9ab3d666df91 hs20-b02
+5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
+f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
+3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
+5484e7c53fa7da5e869902437ee08a9ae10c1c69 hs20-b03