source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict@
1925
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 1911 | 15 years | fixed #3193: No layer is left highlighted when the bottom most one is … | ||
| properties | 1925 | 15 years | Replaced Relation.members with Relation.getMembers() | ||
| relation | 1925 | 15 years | Replaced Relation.members with Relation.getMembers() | ||
| tags | 1843 | 15 years | Use OsmPrimitive methods instead of direct access to keys field when … | ||
| ComparePairListCellRenderer.java | 924 bytes | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ComparePairType.java | 2.8 KB | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ConflictResolver.java | 14.0 KB | 1904 | 15 years | fixed #3141: conflict resolution: "apply partial resolution" doesn't work | |
| ListMergeModel.java | 28.1 KB | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ListMerger.java | 36.5 KB | 1655 | 15 years | better i18n of new conflict stuff | |
| ListRole.java | 258 bytes | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| MergeDecisionType.java | 182 bytes | 1654 | 15 years | added merge support for coordinate conflicts added merge support for … | |
Note:
See TracBrowser
for help on using the repository browser.
