source: josm/trunk/src/org/openstreetmap/josm/data/conflict @ 2979

Name Size Rev Age Author Last Change
../
Conflict.java 2.9 KB 2979   10 years Gubaer fixed #4386: "There are unsolved conflicts in layer X" holds up any …
ConflictCollection.java 9.3 KB 2949   10 years jttt Show only one message box in conflicts dialog when multiple members …
IConflictListener.java 264 bytes 2512   10 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
Note: See TracBrowser for help on using the repository browser.