merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 3 Jul 2014 15:47:13 +0000 (15:47 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 3 Jul 2014 15:47:13 +0000 (15:47 +0000)
commitada4a75848f5bb137730f6f7c8694117e89166d2
tree63373469be72e0f3adf2e786619dbacbd9167194
parentd8db3409d6be29e3ea632e6962be938616ce126e
parent5a308df48a3122156cddb2b50bd3959bcc1e8aee
merge-update from trunk
eu.etaxonomy.taxeditor.store/.classpath
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/build.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java