source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
6830
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 6616 | 10 years | fix #4073 - colour coding of conflicting tags/memberships in way … | ||
| properties | 6792 | 10 years | Sonar - fix various issues | ||
| relation | 6616 | 10 years | fix #4073 - colour coding of conflicting tags/memberships in way … | ||
| tags | 6666 | 10 years |
see #9508 - refactor validator preferences + handling of JScrollPane …
|
||
| ComparePairListCellRenderer.java | 931 bytes | 6084 | 11 years | see #8902 - add missing @Override annotations (patch by shinigami) | |
| ComparePairType.java | 2.9 KB | 6222 | 11 years | Make some more defensive copies of user-supplied arrays, javadoc | |
| ConflictResolver.java | 14.3 KB | 6814 | 10 years | fix #8234 - remove duplicated/unused icons + javadoc | |
| IConflictResolver.java | 353 bytes | 5170 | 12 years | cleanup svn:mime-type properties preventing Java sources from being … | |
| ListMergeModel.java | 30.6 KB | 6830 | 10 years | javadoc fixes for jdk8 compatibility | |
| ListMerger.java | 32.3 KB | 6666 | 10 years |
see #9508 - refactor validator preferences + handling of JScrollPane …
|
|
| 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.
