source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
18845
Name | Size | Rev | Age | Author | Last Change |
---|---|---|---|---|---|
../ | |||||
nodes | 17340 | 4 years | fix #19792: Error during conflict resolution after complex import … | ||
properties | 18489 | 2 years | see #22104 - fix deprecation warnings | ||
relation | 17340 | 4 years | fix #19792: Error during conflict resolution after complex import … | ||
tags | 18845 | 9 months | Fix #23189: Conflict tag tables should resize with the conflict window | ||
AbstractListMergeModel.java | 31.7 KB | 18801 | 11 months | Fix #22832: Code cleanup and some simplification, documentation fixes … | |
AbstractListMerger.java | 32.4 KB | 18801 | 11 months | Fix #22832: Code cleanup and some simplification, documentation fixes … | |
AbstractMergePanel.java | 6.0 KB | 16553 | 4 years | see #19334 - javadoc fixes + protected constructors for abstract classes | |
ComparePairListCellRenderer.java | 1.1 KB | 12661 | 7 years | Fix #14794: Add javadoc for gui/conflict/pair package. | |
ComparePairType.java | 2.8 KB | 18801 | 11 months | Fix #22832: Code cleanup and some simplification, documentation fixes … | |
ConflictResolver.java | 15.6 KB | 17340 | 4 years | fix #19792: Error during conflict resolution after complex import … | |
IConflictResolver.java | 606 bytes | 17333 | 4 years | see #20129 - Fix typos and misspellings in the code (patch by gaben) | |
ListRole.java | 261 bytes | 11330 | 8 years | sonar - fix recent issues | |
MergeDecisionType.java | 395 bytes | 12661 | 7 years | Fix #14794: Add javadoc for gui/conflict/pair package. | |
package-info.java | 174 bytes | 11112 | 8 years | sonar - squid:S1228 - Packages should have a javadoc file … | |
PairTable.java | 1.7 KB | 16553 | 4 years | see #19334 - javadoc fixes + protected constructors for abstract classes |
Note:
See TracBrowser
for help on using the repository browser.