AT: Fixing the failed branching errors/wrongly committed files
authora.theys <a.theys@localhost>
Tue, 17 Jan 2012 12:25:04 +0000 (12:25 +0000)
committera.theys <a.theys@localhost>
Tue, 17 Jan 2012 12:25:04 +0000 (12:25 +0000)
commit6ddb76e844fb11f251af37753b567737ffc42b92
tree59bb23efc9729968f75d1db90be258f3538a3841
parent2297e815a4b0c3f7e8c6bfc52be8ed0dab4d894c
AT: Fixing the failed branching errors/wrongly committed files
13 files changed:
.gitattributes
eu.etaxonomy.taxeditor.application/plugin.xml
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java [deleted file]
eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.class [deleted file]
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/icons/leaf_detail.png [deleted file]
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java [deleted file]
eu.etaxonomy.taxeditor.test/.settings/org.maven.ide.eclipse.prefs [deleted file]