merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 15 Sep 2014 12:20:32 +0000 (12:20 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 15 Sep 2014 12:20:32 +0000 (12:20 +0000)
commit509e269aafb2623db8ef15e316dc5720ffaec66d
tree1eac340fe7a5f5472ed5588b5c28a1880893f144
parent3def8aa53380f89e528c166c155f488aa517d1fc
parent543ccf33387bd9c1058faa0fc6b28565cde7824e
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.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/derivateSearch/DerivateSearchView.java