source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags @ 1622

Name Size Rev Age Author Last Change
../
MergeDecisionType.java 187 bytes 1622   11 years Gubaer first version of extended conflict resolution dialog.
MineTableCellRenderer.java 2.5 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
TagMergeColumnModel.java 1016 bytes 1622   11 years Gubaer first version of extended conflict resolution dialog.
TagMergeItem.java 5.1 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
TagMergeModel.java 6.8 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
TagMerger.java 11.7 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
TagMergeTableCellRenderer.java 1.4 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
TheirTableCellRenderer.java 2.5 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
UndecidedTableCellRenderer.java 3.2 KB 1622   11 years Gubaer first version of extended conflict resolution dialog.
Note: See TracBrowser for help on using the repository browser.