source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@ 2949

Name Size Rev Age Author Last Change
../
nodes 2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
properties 2945   14 years jttt Improvements in conflicts gui
relation 2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
tags 2945   14 years jttt Improvements in conflicts gui
ComparePairListCellRenderer.java 899 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ComparePairType.java 2.8 KB 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
ConflictResolver.java 14.4 KB 2945   14 years jttt Improvements in conflicts gui
IConflictResolver.java 293 bytes 2945   14 years jttt Improvements in conflicts gui
ListMergeModel.java 27.7 KB 2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
ListMerger.java 37.6 KB 2945   14 years jttt Improvements in conflicts gui
ListRole.java 252 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
MergeDecisionType.java 179 bytes 2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
Note: See TracBrowser for help on using the repository browser.