source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags@ 5090

Name Size Rev Age Author Last Change
../
CombinePrimitiveResolverDialog.java 16.1 KB 4310   13 years stoecker fix #6680, fix #6677 - i18n issues
MultiValueCellEditor.java 6.8 KB 4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
MultiValueCellRenderer.java 5.4 KB 4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
MultiValueDecisionType.java 442 bytes 3083   14 years bastiK added svn:eol-style=native to source files
MultiValueResolutionDecision.java 9.5 KB 4223   13 years stoecker fix #6570 (revert change in r4215, see #6547), i18n update, fix typo …
PasteTagsConflictResolverDialog.java 19.6 KB 4387   13 years bastiK fixed #6746 - paste properties in new layer results in nullpointer …
RelationMemberConflictDecision.java 3.7 KB 3083   14 years bastiK added svn:eol-style=native to source files
RelationMemberConflictDecisionEditor.java 2.4 KB 3083   14 years bastiK added svn:eol-style=native to source files
RelationMemberConflictDecisionRenderer.java 3.3 KB 4072   13 years jttt Fix #6301 Check for null mandatory in …
RelationMemberConflictDecisionType.java 1.1 KB 3083   14 years bastiK added svn:eol-style=native to source files
RelationMemberConflictResolver.java 8.0 KB 3479   14 years jttt cosmetics
RelationMemberConflictResolverColumnModel.java 2.3 KB 3210   14 years bastiK autocompletion rework; breaks tageditor plugin and possibly other …
RelationMemberConflictResolverModel.java 10.4 KB 5090   12 years simon04 fix #4842 - Combine ways silently combines when tag is not present on …
RelationMemberConflictResolverTable.java 3.8 KB 3083   14 years bastiK added svn:eol-style=native to source files
TagConflictResolutionUtil.java 2.8 KB 3083   14 years bastiK added svn:eol-style=native to source files
TagConflictResolver.java 3.7 KB 3083   14 years bastiK added svn:eol-style=native to source files
TagConflictResolverColumnModel.java 1.3 KB 3083   14 years bastiK added svn:eol-style=native to source files
TagConflictResolverModel.java 8.0 KB 5090   12 years simon04 fix #4842 - Combine ways silently combines when tag is not present on …
TagConflictResolverTable.java 3.9 KB 3083   14 years bastiK added svn:eol-style=native to source files
Note: See TracBrowser for help on using the repository browser.