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

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