Revision 6ddb76e8
Added by Alex Theys about 12 years ago
.gitattributes | ||
---|---|---|
30 | 30 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java -text |
31 | 31 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java -text |
32 | 32 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java -text |
33 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PalmUses.java -text |
|
34 | 33 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text |
35 | 34 |
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java -text |
36 | 35 |
eu.etaxonomy.taxeditor.application/src/main/resources/log4j.properties -text |
... | ... | |
605 | 604 |
eu.etaxonomy.taxeditor.help/original_document/Taxonomic_Editor_User_Manual_Version_4.doc -text |
606 | 605 |
eu.etaxonomy.taxeditor.help/plugin.xml -text |
607 | 606 |
eu.etaxonomy.taxeditor.help/pom.xml -text |
608 |
eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.class -text |
|
609 | 607 |
eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text |
610 | 608 |
eu.etaxonomy.taxeditor.help/toc.xml -text |
611 | 609 |
eu.etaxonomy.taxeditor.help/tocgettingstarted.xml -text |
... | ... | |
772 | 770 |
eu.etaxonomy.taxeditor.store/icons/icon.png -text |
773 | 771 |
eu.etaxonomy.taxeditor.store/icons/import_wiz.gif -text |
774 | 772 |
eu.etaxonomy.taxeditor.store/icons/large_image.gif -text |
775 |
eu.etaxonomy.taxeditor.store/icons/leaf_detail.png -text |
|
776 | 773 |
eu.etaxonomy.taxeditor.store/icons/linkto_help.gif -text |
777 | 774 |
eu.etaxonomy.taxeditor.store/icons/lockedstate.gif -text |
778 | 775 |
eu.etaxonomy.taxeditor.store/icons/ma_12x12.gif -text |
... | ... | |
1315 | 1312 |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java -text |
1316 | 1313 |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java -text |
1317 | 1314 |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text |
1318 |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewPart.java -text |
|
1319 |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/userecords/UseRecordsViewer.java -text |
|
1320 | 1315 |
eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml -text |
1321 | 1316 |
eu.etaxonomy.taxeditor.store/src/main/resources/log4j.properties -text |
1322 | 1317 |
eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java -text |
... | ... | |
1338 | 1333 |
eu.etaxonomy.taxeditor.test/.classpath -text |
1339 | 1334 |
eu.etaxonomy.taxeditor.test/.project -text |
1340 | 1335 |
eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs -text |
1341 |
eu.etaxonomy.taxeditor.test/.settings/org.maven.ide.eclipse.prefs -text |
|
1342 | 1336 |
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF -text |
1343 | 1337 |
eu.etaxonomy.taxeditor.test/build.properties -text |
1344 | 1338 |
eu.etaxonomy.taxeditor.test/ide/eclipse/EDITor[!!-~]Tests.launch -text |
Also available in: Unified diff
AT: Fixing the failed branching errors/wrongly committed files