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 /jnlp-files/atomic/jogl-awt.jnlp | |
| 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 'jnlp-files/atomic/jogl-awt.jnlp')
| -rw-r--r-- | jnlp-files/atomic/jogl-awt.jnlp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jnlp-files/atomic/jogl-awt.jnlp b/jnlp-files/atomic/jogl-awt.jnlp index 8f15a6c58..528632e96 100644 --- a/jnlp-files/atomic/jogl-awt.jnlp +++ b/jnlp-files/atomic/jogl-awt.jnlp @@ -14,7 +14,7 @@ <all-permissions/> </security> <resources> - <jar href="jar/atomic/jogl-core.jar" /> + <jar href="jar/atomic/jogl.jar" /> <jar href="jar/atomic/jogl-sdk.jar" /> <jar href="jar/atomic/jogl-util.jar" /> <jar href="jar/atomic/jogl-awt.jar" /> |