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

Name Size Rev Age Author Last Change
../
TheirTableCellRenderer.java 2.4 KB 4163   10 years stoecker improve color names of last checkin
TagMergeTableCellRenderer.java 1.4 KB 4162   10 years stoecker fix #4140 - make colors in conflict dialog configurable
TagMerger.java 13.9 KB 5266   9 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
TagMergeModel.java 7.0 KB 5266   9 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
TagMergeItem.java 4.3 KB 3083   12 years bastiK added svn:eol-style=native to source files
TagMergeColumnModel.java 957 bytes 3083   12 years bastiK added svn:eol-style=native to source files
MineTableCellRenderer.java 2.4 KB 4163   10 years stoecker improve color names of last checkin
MergedTableCellRenderer.java 3.0 KB 4162   10 years stoecker fix #4140 - make colors in conflict dialog configurable
Note: See TracBrowser for help on using the repository browser.