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

Name Size Rev Age Author Last Change
../
package-info.java 151 bytes 7937   10 years bastiK add subversion property svn:eol=native
ModifiedConflictResolveCommand.java 2.7 KB 15444   6 years Don-vip fix #18212, see #4088, see #4155 - don't override modified flag of …
CoordinateConflictResolveCommand.java 2.9 KB 14214   7 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
ConflictResolveCommand.java 2.9 KB 14143   7 years Don-vip see #15229 - deprecate Main.main - new class OsmDataManager
WayNodesConflictResolverCommand.java 3.0 KB 13158   8 years Don-vip javadoc
VersionConflictResolveCommand.java 3.0 KB 12726   8 years Don-vip see #13036 - deprecate Command() default constructor, fix unit tests …
DeletedStateConflictResolveCommand.java 3.5 KB 14214   7 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
ConflictAddCommand.java 3.6 KB 14153   7 years Don-vip see #15229 - deprecate Main.parent and Main itself
RelationMemberConflictResolverCommand.java 3.6 KB 14143   7 years Don-vip see #15229 - deprecate Main.main - new class OsmDataManager
TagConflictResolveCommand.java 4.1 KB 14214   7 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
Note: See TracBrowser for help on using the repository browser.