merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Aug 2014 13:35:24 +0000 (13:35 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 19 Aug 2014 13:35:24 +0000 (13:35 +0000)
commit1bf80c0c5daafa3cf40d34be966146731c669fb9
treedfca8039ab6cfae6bef517048dc3be76d25d0a22
parent0eafce3b8120aa81638466596dc8b4e0f715b4ce
parentba33715942b94caa22390ce6816f8da71b627786
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
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/derivateSearch/DerivateSearchCompositeController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java