diff --git a/Core/build.xml b/Core/build.xml index a2e901c3a9..a312ebf223 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -45,7 +45,7 @@ - + @@ -64,7 +64,8 @@ - + + @@ -96,8 +97,8 @@ tofile="${ext.dir}/mchange-commons-java-0.2.9.jar"/> - + @@ -109,7 +110,7 @@ - + @@ -139,11 +140,11 @@ - + - + - + @@ -156,8 +157,8 @@ + The strings get merged during compilation. This target copies that merged file into src so that it can be checked + in and used as a basis for translation efforts --> diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 3caa4d3662..ccab26fbbd 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -60,7 +60,8 @@ file.reference.parso-2.0.10.jar=release\\modules\\ext\\parso-2.0.10.jar file.reference.pdfbox-2.0.13.jar=release\\modules\\ext\\pdfbox-2.0.13.jar file.reference.pdfbox-tools-2.0.13.jar=release\\modules\\ext\\pdfbox-tools-2.0.13.jar file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar -file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar +file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar +file.reference.RejView.jar=release/modules/ext/RejView.jar file.reference.rome-1.12.0.jar=release\\modules\\ext\\rome-1.12.0.jar file.reference.sentiment-analysis-parser-0.1.jar=release\\modules\\ext\\sentiment-analysis-parser-0.1.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 1ee0f19822..2ab368e2af 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -682,8 +682,12 @@ release\modules\ext\dec-0.1.2.jar - ext/Rejistry-1.0-SNAPSHOT.jar - release/modules/ext/Rejistry-1.0-SNAPSHOT.jar + ext/Rejistry-1.1-SNAPSHOT.jar + release/modules/ext/Rejistry-1.1-SNAPSHOT.jar + + + ext/RejView.jar + release/modules/ext/RejView.jar ext/dd-plist-1.20.jar diff --git a/thirdparty/rejView/RejView.jar b/thirdparty/rejView/RejView.jar new file mode 100644 index 0000000000..685d925c7a Binary files /dev/null and b/thirdparty/rejView/RejView.jar differ diff --git a/thirdparty/rejistry/Rejistry-1.0-SNAPSHOT.jar b/thirdparty/rejistry/Rejistry-1.1-SNAPSHOT.jar old mode 100755 new mode 100644 similarity index 59% rename from thirdparty/rejistry/Rejistry-1.0-SNAPSHOT.jar rename to thirdparty/rejistry/Rejistry-1.1-SNAPSHOT.jar index 90fc228b44..0993c56a9a Binary files a/thirdparty/rejistry/Rejistry-1.0-SNAPSHOT.jar and b/thirdparty/rejistry/Rejistry-1.1-SNAPSHOT.jar differ