source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair
@
2940
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … | |
| properties | 2940 | 3 years | mjulius | display list of referrers in ConflictResolutionDialog | |
| relation | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … | |
| tags | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … | |
| ComparePairListCellRenderer.java | 899 bytes | 2512 | 4 years | stoecker | i18n updated, fixed files to reduce problems when applying patches, fix … |
| ComparePairType.java | 2.8 KB | 2512 | 4 years | stoecker | i18n updated, fixed files to reduce problems when applying patches, fix … |
| ConflictResolver.java | 14.5 KB | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … |
| IConflictResolver.java | 183 bytes | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … |
| ListMergeModel.java | 26.3 KB | 2936 | 3 years | jttt | Fixed #4408 confict manager: do not have to solve tag- and … |
| ListMerger.java | 35.4 KB | 2846 | 3 years | mjulius | fix messages for gui/conflict |
| ListRole.java | 252 bytes | 2512 | 4 years | stoecker | i18n updated, fixed files to reduce problems when applying patches, fix … |
| MergeDecisionType.java | 179 bytes | 2512 | 4 years | stoecker | i18n updated, fixed files to reduce problems when applying patches, fix … |
Note: See TracBrowser
for help on using the repository browser.
