hg: haiku/haiku/hotspot: 2 new changesets

[hamish at lavabit.com]

Changeset: 4a85ea93d2ab
Author:    hamish
Date:      2012-10-13 01:34 +0100
URL:       http://hg.openjdk.java.net/haiku/haiku/hotspot/rev/4a85ea93d2ab

JVM_LoadLibrary: return the dlerror() message upon failure

! src/os/haiku/vm/os_haiku.cpp

Changeset: 5c5f3d9feffd
Author:    hamish
Date:      2012-10-13 01:35 +0100
URL:       http://hg.openjdk.java.net/haiku/haiku/hotspot/rev/5c5f3d9feffd

Remove all the extra files added during the botched merge

- make/haiku/makefiles/cscope.make
- make/haiku/makefiles/makedeps.make
- make/haiku/makefiles/xslt-xalan.sh
- make/haiku/makefiles/xslt-xsltproc.sh
- src/os/haiku/launcher/java.c
- src/os/haiku/launcher/java.h
- src/os/haiku/launcher/java_md.c
- src/os/haiku/launcher/java_md.h
- src/os/haiku/vm/hpi_haiku.cpp
- src/os/haiku/vm/hpi_haiku.hpp
- src/os/haiku/vm/objectMonitor_haiku.cpp
- src/os/haiku/vm/objectMonitor_haiku.hpp
- src/os/haiku/vm/objectMonitor_haiku.inline.hpp
- src/os/haiku/vm/vtune_haiku.cpp
- src/share/tools/MakeDeps/ArgsParser.cpp
- src/share/tools/MakeDeps/ArgsParser.h
- src/share/tools/MakeDeps/BuildConfig.cpp
- src/share/tools/MakeDeps/BuildConfig.h
- src/share/tools/MakeDeps/Database.cpp
- src/share/tools/MakeDeps/Database.h
- src/share/tools/MakeDeps/DirectoryTree.cpp
- src/share/tools/MakeDeps/DirectoryTree.h
- src/share/tools/MakeDeps/DirectoryTreeNode.h
- src/share/tools/MakeDeps/Exceptions.cpp
- src/share/tools/MakeDeps/Exceptions.h
- src/share/tools/MakeDeps/FileFormatException.cpp
- src/share/tools/MakeDeps/FileFormatException.h
- src/share/tools/MakeDeps/FileList.cpp
- src/share/tools/MakeDeps/FileList.h
- src/share/tools/MakeDeps/FileName.cpp
- src/share/tools/MakeDeps/FileName.h
- src/share/tools/MakeDeps/Macro.h
- src/share/tools/MakeDeps/MacroDefinitions.cpp
- src/share/tools/MakeDeps/MacroDefinitions.h
- src/share/tools/MakeDeps/MakeDeps.cpp
- src/share/tools/MakeDeps/MakeDeps.h
- src/share/tools/MakeDeps/MetroWerksMacPlatform.cpp
- src/share/tools/MakeDeps/MetroWerksMacPlatform.h
- src/share/tools/MakeDeps/Platform.cpp
- src/share/tools/MakeDeps/Platform.h
- src/share/tools/MakeDeps/UnixPlatform.cpp
- src/share/tools/MakeDeps/UnixPlatform.h
- src/share/tools/MakeDeps/Util.cpp
- src/share/tools/MakeDeps/Util.h
- src/share/tools/MakeDeps/WinGammaPlatform.cpp
- src/share/tools/MakeDeps/WinGammaPlatform.h
- src/share/tools/MakeDeps/WinGammaPlatformVC6.cpp
- src/share/tools/MakeDeps/WinGammaPlatformVC6.h
- src/share/tools/MakeDeps/WinGammaPlatformVC7.cpp
- src/share/tools/MakeDeps/WinGammaPlatformVC7.h
- src/share/tools/MakeDeps/java2cpp
- src/share/tools/MakeDeps/java2cpp.sed
- src/share/tools/MakeDeps/makefile
- src/share/tools/MakeDeps/sstream.old
- src/share/tools/jvmti/jvmtiEnvFill.cpp
- src/share/tools/jvmti/jvmtiEnvFill.hpp