Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:58:23 +0000 (17:58 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:58:23 +0000 (17:58 +0200)
commit18358a529a0a508bad94a1a2ba23582b89d81385
tree861102f3ba1372dadc9fcc4e3fcc2ed146e3515e
parent467d468b148490ebdf7f95f8b8dffb40a850a4f9
parentf27dd202d57f7964412d7fe47f9d54b8429cbc44
Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
13 files changed:
eu.etaxonomy.taxeditor.application/.classpath
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.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor/pom.xml
pom.xml