Changeset 1650 in josm for trunk/.classpath

Timestamp:

2009-06-07T15:04:28+02:00 (15 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:

• trunk/.classpath (modified) (2 diffs)

trunk/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry excluding="build/|dist/|src/|test/" including="images/|presets/|styles/" kind="src" path=""/>
+        <classpathentry kind="src" path="test/unit"/>
+        <classpathentry kind="src" path="test/functional"/>
+        <classpathentry excluding="build/|dist/|src/|test/|test/unit/|test/functional/" including="images/|presets/|styles/" kind="src" path=""/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/>
@@ -9 +11 @@
         <classpathentry kind="lib" path="lib/josm-translation.jar"/>
         <classpathentry kind="lib" path="lib/gettext-commons-0.9.6.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
+        <classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>