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

Name Size Rev Age Author Last Change
../
ConflictAddCommand.java 3.3 KB 10378   4 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
ConflictResolveCommand.java 3.2 KB 10364   4 years stoecker gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage
CoordinateConflictResolveCommand.java 2.9 KB 9371   4 years simon04 Java 7: use Objects.equals and Objects.hash
DeletedStateConflictResolveCommand.java 3.5 KB 9371   4 years simon04 Java 7: use Objects.equals and Objects.hash
ModifiedConflictResolveCommand.java 2.6 KB 10216   4 years Don-vip findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes
package-info.java 151 bytes 7937   5 years bastiK add subversion property svn:eol=native
RelationMemberConflictResolverCommand.java 3.4 KB 10413   4 years Don-vip fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by …
TagConflictResolveCommand.java 4.1 KB 10671   4 years Don-vip see #12472 - fix "MissingCasesInEnumSwitch" warnings
VersionConflictResolveCommand.java 2.9 KB 10216   4 years Don-vip findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes
WayNodesConflictResolverCommand.java 2.8 KB 10467   4 years Don-vip fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core
Note: See TracBrowser for help on using the repository browser.