diff options
| author | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-05 15:13:19 +0200 |
| commit | 06fc570f70dc5ccfad7399d8426bdf224c239a5a (patch) | |
| tree | f844f7c9bcd564a8d945e5e7f1f085409f91d3b1 /src/oculusvr | |
| parent | bda482e4eee76a5ba2139645682ae64dadacbc6b (diff) | |
| parent | 5951b33b303df3a12888fe0fbc5ccc88112a3984 (diff) | |
Merge remote-tracking branch 'github-mark/master' (Bug 1023/Bug 1024)
Conflicts:
make/scripts/tests.sh
(build.xml: Using <copy tofile=".."/> instead of producing new jar files via <jar> to keep identity)
Diffstat (limited to 'src/oculusvr')
| -rw-r--r-- | src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java index 8eafb9927..ad0105bdb 100644 --- a/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java +++ b/src/oculusvr/classes/com/jogamp/oculusvr/OVRDynamicLibraryBundleInfo.java @@ -48,7 +48,7 @@ import java.util.*; if(TempJarCache.isInitialized()) { // only: joal.jar -> joal-natives-<os.and.arch>.jar - JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { OVRDynamicLibraryBundleInfo.class }, null, null ); + JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { OVRDynamicLibraryBundleInfo.class }, null); } return null; } |