From: Patric Plitzner
Date: Thu, 4 Jun 2015 16:43:56 +0000 (+0000)
Subject: - updating versions due to release
X-Git-Tag: 3.6.0~4
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/208b2a3b61dd028c247d3f92ad4fde1b8f956cda
- updating versions due to release
---
diff --git a/eu.etaxonomy.taxeditor.application/.classpath b/eu.etaxonomy.taxeditor.application/.classpath
index 4c7e96f59..53dbdc780 100644
--- a/eu.etaxonomy.taxeditor.application/.classpath
+++ b/eu.etaxonomy.taxeditor.application/.classpath
@@ -4,5 +4,6 @@
+
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index b0c8a2f1a..71abfad56 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -2,9 +2,9 @@
-
-
-
+
+
+
@@ -34,7 +34,7 @@
-
+
@@ -127,11 +127,11 @@
-
-
+
+
-
+
@@ -193,29 +193,26 @@
-<<<<<<< HEAD
-=======
-
+
-
+
-
+
-
->>>>>>> 02176688eaa23a31ff5b71c317cb5ee685483aa4
+
-
+
diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath
index 4deb39a8f..12d3a7cdd 100644
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -1,8 +1,8 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 7bc180fdf..7f4ff50a2 100644
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,7 +1,14 @@
-
+
+
+
+
+
+
+
+
@@ -19,13 +26,5 @@
-
-
-
-
-
-
--Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx512m
-