Changeset 1650 in josm for trunk/.classpath


Ignore:
Timestamp:
2009-06-07T15:04:28+02:00 (10 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/.classpath

    r1595 r1650  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry excluding="build/|dist/|src/|test/" including="images/|presets/|styles/" kind="src" path=""/>
     4        <classpathentry kind="src" path="test/unit"/>
     5        <classpathentry kind="src" path="test/functional"/>
     6        <classpathentry excluding="build/|dist/|src/|test/|test/unit/|test/functional/" including="images/|presets/|styles/" kind="src" path=""/>
    57        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
    68        <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/>
     
    911        <classpathentry kind="lib" path="lib/josm-translation.jar"/>
    1012        <classpathentry kind="lib" path="lib/gettext-commons-0.9.6.jar"/>
     13        <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
     14        <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
     15        <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
     16        <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
     17        <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
     18        <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
     19        <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
    1120        <classpathentry kind="output" path="bin"/>
    1221</classpath>
Note: See TracChangeset for help on using the changeset viewer.