BGBM BDI Git - taxeditor.git/commit

BGBM BDI Projects / taxeditor.git / commit

author	Cherian Mathew <c.mathew@bgbm.org>
	Mon, 24 Aug 2015 09:34:25 +0000 (11:34 +0200)
committer	Cherian Mathew <c.mathew@bgbm.org>
	Mon, 24 Aug 2015 09:34:25 +0000 (11:34 +0200)
commit	7d7c55628912da9ba6196645caefc1575a3e7a0d
tree	00d6e2adb49729de29d98d2ce60f19e785941c37	tree \| snapshot
parent	aed321e2eef26c151a7942ba128495f7abfe81d6	commit \| diff
parent	2a0f3d063b494aa331a191dba2e4e189f15af0aa	commit \| diff

Merge branch 'develop' into remoting-4.0

Conflicts:
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/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java

13 files changed:

eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/plugin.xml	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java	diff1 \|	diff2 \|	blob \| history
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/dataimport/transientServices/TransientTaxonService.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/handler/MoveDescriptionToOtherTaxonHandler.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java	diff1 \|	diff2 \|	blob \| history
pom.xml	diff1 \|	diff2 \|	blob \| history

RSS Atom

eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/plugin.xml	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java	diff1 \|	diff2 \|	blob \| history
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/dataimport/transientServices/TransientTaxonService.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/handler/MoveDescriptionToOtherTaxonHandler.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java	diff1 \|	diff2 \|	blob \| history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java	diff1 \|	diff2 \|	blob \| history
pom.xml	diff1 \|	diff2 \|	blob \| history