« Previous | Next »

Revision 9fde911b

Added by Patrick Plitzner over 6 years ago

ID 9fde911b79fa46b99643db29cd927bdb69c78c01
Parent b994005d, 9e848eb6
Child 9d4c1568

Merge branch 'develop' into featureTreeEditor

Conflicts:¶

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java¶

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDropAdapter.java¶

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java¶

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditorComposite.java¶

Changes

added
modified
copied
renamed
deleted