source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
4478
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 4191 | 13 years | remove old debug stuff | ||
| properties | 4310 | 13 years | fix #6680, fix #6677 - i18n issues | ||
| relation | 4478 | 13 years | fix #5374 and #6315 - NPE in relations conflict manager | ||
| tags | 4191 | 13 years | remove old debug stuff | ||
| ComparePairListCellRenderer.java | 917 bytes | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | |
| ComparePairType.java | 2.8 KB | 3083 | 14 years | added svn:eol-style=native to source files | |
| ConflictResolver.java | 13.8 KB | 4191 | 13 years | remove old debug stuff | |
| IConflictResolver.java | 353 bytes | 3083 | 14 years | added svn:eol-style=native to source files | |
| ListMergeModel.java | 28.6 KB | 4191 | 13 years | remove old debug stuff | |
| ListMerger.java | 37.6 KB | 4310 | 13 years | fix #6680, fix #6677 - i18n issues | |
| ListRole.java | 252 bytes | 3083 | 14 years | added svn:eol-style=native to source files | |
| MergeDecisionType.java | 179 bytes | 3083 | 14 years | added svn:eol-style=native to source files | |
Note:
See TracBrowser
for help on using the repository browser.
