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

Name Size Rev Age Author Last Change
../
ConflictAddCommand.java 3.6 KB 14153   6 years Don-vip see #15229 - deprecate Main.parent and Main itself
ConflictResolveCommand.java 2.9 KB 16553   5 years Don-vip see #19334 - javadoc fixes + protected constructors for abstract classes
CoordinateConflictResolveCommand.java 2.9 KB 14214   6 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
DeletedStateConflictResolveCommand.java 3.5 KB 14214   6 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
ModifiedConflictResolveCommand.java 2.7 KB 19050   9 months taylor.smock Revert most var changes from r19048, fix most new compile warnings …
package-info.java 151 bytes 7937   10 years bastiK add subversion property svn:eol=native
RelationMemberConflictResolverCommand.java 3.6 KB 14143   6 years Don-vip see #15229 - deprecate Main.main - new class OsmDataManager
TagConflictResolveCommand.java 4.1 KB 16436   5 years simon04 see #19251 - Java 8: use Stream
VersionConflictResolveCommand.java 3.0 KB 19050   9 months taylor.smock Revert most var changes from r19048, fix most new compile warnings …
WayNodesConflictResolverCommand.java 3.0 KB 13158   7 years Don-vip javadoc
Note: See TracBrowser for help on using the repository browser.