merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 10 Sep 2014 12:57:06 +0000 (12:57 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 10 Sep 2014 12:57:06 +0000 (12:57 +0000)
commitd98c659b114c49e73fb5c6cc376aa4185a978104
tree61fed1d6a37e36d2e7d6a0362e79983dadd5680f
parent59be9831d68e209e727bbd1df9d6cdd952d2e051
parent00a620627c38a643624f0622e146254b4b128229
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
pom.xml