BGBM BDI Git - taxeditor.git/commit

BGBM BDI Projects / taxeditor.git / commit

author	Cherian Mathew <c.mathew@bgbm.org>
	Tue, 8 Sep 2015 18:49:12 +0000 (20:49 +0200)
committer	Cherian Mathew <c.mathew@bgbm.org>
	Tue, 8 Sep 2015 18:49:12 +0000 (20:49 +0200)
commit	9f1df71ff493de7c5c2f9879d9a133dd4e43d997
tree	69ec9f6c9589d190857559a724a0bc889c43122b	tree \| snapshot
parent	bcc5b52f6d10e82b9ac38750b61ae1a48deaa028	commit \| diff
parent	d9848a0c2c5547e9bf14cf0481bb8f300b3d434a	commit \| diff

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java

RSS Atom

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java	diff1 \|	diff2 \|	blob \| history