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

Name Size Rev Age Author Last Change
../
ConflictAddCommand.java 3.4 KB 11848   3 years Don-vip fix #14613 - Special HTML characters not escaped in GUI error messages
ConflictResolveCommand.java 3.2 KB 10364   3 years stoecker gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage
CoordinateConflictResolveCommand.java 2.8 KB 11452   3 years Don-vip sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - …
DeletedStateConflictResolveCommand.java 3.5 KB 11452   3 years Don-vip sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - …
ModifiedConflictResolveCommand.java 2.6 KB 10216   3 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.6 KB 11318   3 years Don-vip refactor conflict classes
TagConflictResolveCommand.java 4.1 KB 10671   3 years Don-vip see #12472 - fix "MissingCasesInEnumSwitch" warnings
VersionConflictResolveCommand.java 2.9 KB 10216   3 years Don-vip findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes
WayNodesConflictResolverCommand.java 2.8 KB 10467   3 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.