source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
5299
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| properties | 5266 | 13 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | ||
| tags | 5266 | 13 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | ||
| nodes | 5299 | 13 years | conflict dialog: better display of empty rows in members tab, like … | ||
| relation | 5299 | 13 years | conflict dialog: better display of empty rows in members tab, like … | ||
| MergeDecisionType.java | 179 bytes | 3083 | 15 years | added svn:eol-style=native to source files | |
| ComparePairListCellRenderer.java | 917 bytes | 4162 | 14 years | fix #4140 - make colors in conflict dialog configurable | |
| IConflictResolver.java | 353 bytes | 5170 | 13 years | cleanup svn:mime-type properties preventing Java sources from being … | |
| ComparePairType.java | 2.8 KB | 5266 | 13 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | |
| ListRole.java | 253 bytes | 5266 | 13 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | |
| ConflictResolver.java | 14.3 KB | 5297 | 13 years | fix #4493, fix #7750: conflict dialog, nodes and members tab: allow … | |
| ListMergeModel.java | 30.1 KB | 5298 | 13 years | see #4899, see #7266, see #7333: Resolved NPE in conflict manager when … | |
| ListMerger.java | 38.0 KB | 5298 | 13 years | see #4899, see #7266, see #7333: Resolved NPE in conflict manager when … | |
Note:
See TracBrowser
for help on using the repository browser.
