source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair@ 5299

Name Size Rev Age Author Last Change
../
tags 5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
relation 5299   12 years Don-vip conflict dialog: better display of empty rows in members tab, like …
properties 5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
nodes 5299   12 years Don-vip conflict dialog: better display of empty rows in members tab, like …
ListMerger.java 38.0 KB 5298   12 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
ListMergeModel.java 30.1 KB 5298   12 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
ConflictResolver.java 14.3 KB 5297   12 years Don-vip fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
ComparePairType.java 2.8 KB 5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
ComparePairListCellRenderer.java 917 bytes 4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
IConflictResolver.java 353 bytes 5170   12 years Don-vip cleanup svn:mime-type properties preventing Java sources from being …
ListRole.java 253 bytes 5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
MergeDecisionType.java 179 bytes 3083   14 years bastiK added svn:eol-style=native to source files
Note: See TracBrowser for help on using the repository browser.