source: josm/trunk/src/org/openstreetmap/josm/command/conflict @ 8510

Name Size Rev Age Author Last Change
../
ConflictAddCommand.java 3.5 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
ConflictResolveCommand.java 3.3 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
CoordinateConflictResolveCommand.java 3.2 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
DeletedStateConflictResolveCommand.java 3.8 KB 8456   5 years Don-vip see #11508 - override hashCode() and equals() in other commands as well
ModifiedConflictResolveCommand.java 2.8 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
package-info.java 151 bytes 7937   6 years bastiK add subversion property svn:eol=native
RelationMemberConflictResolverCommand.java 4.0 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
TagConflictResolveCommand.java 4.5 KB 8509   5 years Don-vip fix many checkstyle violations
VersionConflictResolveCommand.java 3.1 KB 8510   5 years Don-vip checkstyle: enable relevant whitespace checks and fix them
WayNodesConflictResolverCommand.java 3.3 KB 8456   5 years Don-vip see #11508 - override hashCode() and equals() in other commands as well
Note: See TracBrowser for help on using the repository browser.