merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 12:39:34 +0000 (12:39 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 29 Jun 2015 12:39:34 +0000 (12:39 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF

diff --cc .gitattributes
@@@ -1016,7 -976,7 +1016,6 @@@ eu.etaxonomy.taxeditor.navigation/src/m
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigatorDataChangeBehavior.java -text
--eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeContentProvider.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java -text