source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict@
1650
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | ||
| relation | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | ||
| tags | 1642 | 15 years | added row numbers and synchronized scrolling in conflict resolution … | ||
| 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 | 9.5 KB | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ListMergeModel.java | 28.1 KB | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ListMerger.java | 36.6 KB | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
| ListRole.java | 258 bytes | 1650 | 15 years | added concept of "merge pairs" (my vs. merged, my vs. their, their vs. … | |
Note:
See TracBrowser
for help on using the repository browser.
