BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 902d787 16cd938)
Merge branch 'release/3.7.0'
authorjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
committerjenkins <jenkins-int@bgbm.org>
Wed, 15 Jul 2015 15:56:02 +0000 (17:56 +0200)
Conflicts:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF

1  2 
eu.etaxonomy.taxeditor.cdmlib/.classpath patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.feature/feature.xml patch | diff1 | diff2 | blob | history
pom.xml patch | diff1 | diff2 | blob | history

diff --cc eu.etaxonomy.taxeditor.feature/feature.xml
index 26fe7a2613d6728eed7e750286b383883587a4a2,53ffb9ba873278506abffce993fbfc294b362bf2..92d7ebe7c71900b09d598fe30b62ba24773c79d1
--- 1/eu.etaxonomy.taxeditor.feature/feature.xml
--- 2/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@@ -2,7 -2,7 +2,11 @@@
  <feature
        id="eu.etaxonomy.taxeditor.feature"
        label="Taxonomic Editor"
++<<<<<<< HEAD
 +      version="3.6.1"
++=======
+       version="3.7.0"
++>>>>>>> refs/heads/release/3.7.0
        provider-name="EDIT"
        plugin="eu.etaxonomy.taxeditor.application"
        os="linux,macosx,win32"
diff --cc pom.xml
Simple merge