Changeset 1650 in josm for trunk/build.xml


Ignore:
Timestamp:
2009-06-07T15:04:28+02:00 (12 years ago)
Author:
Gubaer
Message:

added concept of "merge pairs" (my vs. merged, my vs. their, their vs. merged)
added highlighting of conflicts with colors
now displays number of entries for lists
fixed bugs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1584 r1650  
    9696                <delete dir="dist" />
    9797        </target>
     98       
     99        <target name="dev-deploy" depends="dist">
     100                <copy file="dist/josm-custom.jar" todir="C:\data\projekte\osm\tag-editor-plugin"/>
     101        </target>
     102
    98103
    99104</project>
Note: See TracChangeset for help on using the changeset viewer.