BGBM BDI Git - taxeditor.git/commit

Merge branch 'develop' into bulkEditorE4

# Conflicts:
# eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
# eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java
# eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
# eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
# eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java
# eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java
# eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingMoveTaxonNodeHandlerE4.java
# eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/SetSecReferenceForSubtreeHandler.java
# eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
# eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java

author	Patrick Plitzner <p.plitzner@bgbm.org>
	Fri, 22 Sep 2017 15:43:41 +0000 (17:43 +0200)
committer	Patrick Plitzner <p.plitzner@bgbm.org>
	Fri, 22 Sep 2017 15:43:41 +0000 (17:43 +0200)
commit	bac632298ff44d6e1d6ea0266f30da6e34412ac0
tree	1290f9cb866fc65425fdcd6cd50c3e76e024f7c5	tree \| snapshot
parent	fd7d64e9ccc12f163ebd3425323376cedf43e9a3	commit \| diff
parent	77373f567e64fbf8bb2cda1128ea242061e11f65	commit \| diff

eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/fragment.e4xmi	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/ConceptViewPartE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/SetSecReferenceForSubtreeHandlerE4.java	diff1 \|	\|	blob \| history
eu.etaxonomy.taxeditor.store/fragment.e4xmi	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java	diff1 \|	diff2 \|	blob \| history