[1.5] backport r1017, r1030:1032 from trunk + additional fix for cmake and autotools

2011-11-02 00:49:20 +00:00
parent 49a0f0db8f
commit 238b767917
84 changed files with 1359 additions and 1018 deletions
--- a/applications/jpip/util/opj_viewer/dist/manifest.txt
+++ b/applications/jpip/util/opj_viewer/dist/manifest.txt
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.7.0
+Created-By: Kaori Hagihara
+Main-Class: ImageWindow
--- a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar
+++ b/applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar
--- a/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar
+++ b/applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar
--- a/applications/jpip/util/opj_viewer/dist/opj_viewer.jar
+++ b/applications/jpip/util/opj_viewer/dist/opj_viewer.jar
@@ -0,0 +1 @@
+opj_viewer-20111026.jar