merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
commit552114a0c1c1ae0b87f65e76ab6cb6e47c5a9bae
tree69ec97de555dfd0bf097d8bed7b6a6d74514060f
parentc3706882e27beef4b4a5bad0c13ab9073fbd6c80
parent1568c431c8ebd19ae01691ac829d2a51c6a61a31
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
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