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

Name Size Rev Age Author Last Change
../
nodes 3719   13 years bastiK added missing license information
properties 3786   13 years Upliner remove OperationCancelledException class which is unused since [3362]
relation 3844   13 years stoecker see #5899 - support different display of closed ways and areas
tags 3083   14 years bastiK added svn:eol-style=native to source files
ComparePairListCellRenderer.java 899 bytes 3083   14 years bastiK added svn:eol-style=native to source files
ComparePairType.java 2.8 KB 3083   14 years bastiK added svn:eol-style=native to source files
ConflictResolver.java 13.9 KB 3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
IConflictResolver.java 353 bytes 3083   14 years bastiK added svn:eol-style=native to source files
ListMergeModel.java 28.7 KB 3766   13 years stoecker fix help
ListMerger.java 37.7 KB 3719   13 years bastiK added missing license information
ListRole.java 252 bytes 3083   14 years bastiK added svn:eol-style=native to source files
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.