diff options
| author | Sven Gothel <[email protected]> | 2014-07-05 15:11:37 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-07-05 15:11:37 +0200 |
| commit | 95dad44d1e825382bc5895f76c21f24bc5776501 (patch) | |
| tree | 4997a341b434e1b7b03e82e2eeb81e0316c37dea /nbproject | |
| parent | df9ff7f340a5ab4e07efc613f5f264eeae63d4c7 (diff) | |
| parent | dc1fee7a307ed24c1b6b02fa0936641450c24984 (diff) | |
Merge remote-tracking branch 'github-mark/master' (Bug 1023, Bug 1024)
Conflicts:
src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
src/java/com/jogamp/common/os/Platform.java
src/junit/com/jogamp/common/util/TestTempJarCache.java
(re-injected that api-doc of addNativeJarLibsImpl)
Diffstat (limited to 'nbproject')
0 files changed, 0 insertions, 0 deletions