Ignore:
Timestamp:
2006-04-21T14:31:51+02:00 (18 years ago)
Author:
imi
Message:
  • added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/org/openstreetmap/josm/gui/ShowModifiers.java

    r46 r86  
    131131        }
    132132
    133         @Override
    134         public void paint(Graphics g) {
     133        @Override public void paint(Graphics g) {
    135134                super.paint(g);
    136135                paintMouse(g);
Note: See TracChangeset for help on using the changeset viewer.