source:
josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@
9482
| Name | Size | Rev | Age | Author | Last Change |
|---|---|---|---|---|---|
| ../ | |||||
| nodes | 9243 | 9 years | javadoc update | ||
| properties | 9468 | 9 years | fix #8804 - Add version info to conflict dialog | ||
| relation | 9078 | 9 years | sonar - Immutable Field | ||
| tags | 9440 | 9 years | see #12338 - Conflict resolution: add expert actions "Resolve to … | ||
| ComparePairListCellRenderer.java | 1005 bytes | 7001 | 10 years | see #8465 - switch core to Java 7 | |
| ComparePairType.java | 2.9 KB | 9212 | 9 years | checkstyle 6.14 + tune xml validation settings in Eclipse project | |
| ConflictResolver.java | 15.4 KB | 9482 | 9 years | see #12338 fix #12381 - AssertionError on "Resolve to their versions" | |
| IConflictResolver.java | 408 bytes | 9440 | 9 years | see #12338 - Conflict resolution: add expert actions "Resolve to … | |
| ListMergeModel.java | 30.7 KB | 8840 | 9 years | sonar - squid:S3052 - Fields should not be initialized to default values | |
| ListMerger.java | 32.8 KB | 9482 | 9 years | see #12338 fix #12381 - AssertionError on "Resolve to their versions" | |
| ListRole.java | 253 bytes | 5266 | 12 years | fixed majority of javadoc warnings by replacing "{@see" by "{@link" | |
| MergeDecisionType.java | 179 bytes | 3083 | 15 years | added svn:eol-style=native to source files | |
| PairTable.java | 1.3 KB | 8509 | 9 years | fix many checkstyle violations | |
Note:
See TracBrowser
for help on using the repository browser.
