source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
4162
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | ||
| properties | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | ||
| relation | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | ||
| tags | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | ||
| 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.9 KB | 3362 | 14 years | fix #5182 - Conflict system simplification - patch by Upliner | |
| IConflictResolver.java | 353 bytes | 3083 | 14 years | added svn:eol-style=native to source files | |
| ListMergeModel.java | 28.6 KB | 3995 | 13 years | fix #3590 - Primitives or objects: Pick one | |
| ListMerger.java | 37.7 KB | 3719 | 13 years | added missing license information | |
| 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.
