source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
5832
Name | Size | Rev | Age | Author | Last Change |
---|---|---|---|---|---|
../ | |||||
nodes | 5335 | 12 years | fix #7855 - conflict dialog: CCE selecting a way in members tab | ||
properties | 5481 | 12 years | some cleanup, mainly javadoc | ||
relation | 5335 | 12 years | fix #7855 - conflict dialog: CCE selecting a way in members tab | ||
tags | 5832 | 11 years | i18n update and javadoc fixes | ||
ComparePairListCellRenderer.java | 917 bytes | 4162 | 13 years | fix #4140 - make colors in conflict dialog configurable | |
ComparePairType.java | 2.8 KB | 5266 | 12 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | |
ConflictResolver.java | 14.3 KB | 5297 | 12 years | fix #4493, fix #7750: conflict dialog, nodes and members tab: allow … | |
IConflictResolver.java | 353 bytes | 5170 | 12 years | cleanup svn:mime-type properties preventing Java sources from being … | |
ListMergeModel.java | 30.5 KB | 5335 | 12 years | fix #7855 - conflict dialog: CCE selecting a way in members tab | |
ListMerger.java | 39.5 KB | 5429 | 12 years | fix #7917 - Control the number of items displayed at once in all … | |
ListRole.java | 253 bytes | 5266 | 12 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | |
MergeDecisionType.java | 179 bytes | 3083 | 14 years | added svn:eol-style=native to source files | |
PairTable.java | 1.3 KB | 5310 | 12 years | fix #7750 - Conflict dialog: Really selects id:0 primitives without zooming |
Note:
See TracBrowser
for help on using the repository browser.