Merge branch 'develop' into unify_derivative_views
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 20 Oct 2015 09:31:49 +0000 (11:31 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 20 Oct 2015 09:31:49 +0000 (11:31 +0200)
commit403887ce651cc123fdddda66946bec087903a372
tree4220ce78e7581520d61a1a15be88b95ace234fef
parentb0792cd50c309892548c85219aefa1bdf04dd60d
parent9d63acde3e4a4a6fdb9cf6b5bd9e3eaecefed0f5
Merge branch 'develop' into unify_derivative_views
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java