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)
1  2 
.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

diff --cc .gitattributes
Simple merge
index 9fb167cc8644ced846238dee40784f7341832719,9fb167cc8644ced846238dee40784f7341832719..4cf488ee33f1a17bac6e7badc2adfac6cf54f75d
Binary files differ
index 25f118068392d39fda76feea6c855dfb3633db17,25f118068392d39fda76feea6c855dfb3633db17..f131a431cbf20a8f2194c84912950bd3e0a6485b
Binary files differ
diff --cc pom.xml
Simple merge