merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:42:23 +0000 (11:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 14 Oct 2014 11:42:23 +0000 (11:42 +0000)
commitf1b8fe0799a92bb73a2d090191609dc1f81af82d
tree8e5a955f6058fa2a0ac7da2b26fc774a0beb70c8
parent5411897d0cf111c4d045c63b050b6999447bef6a
parentbfca1fe58b30012e24017bafb540652b13deb108
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
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/pom.xml