|
Last change
on this file since 1650 was
1650,
checked in by Gubaer, 15 years ago
|
|
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 size:
1.3 KB
|
| Line | |
|---|
| 1 | <?xml version="1.0" encoding="UTF-8"?> |
|---|
| 2 | <classpath> |
|---|
| 3 | <classpathentry kind="src" path="src"/> |
|---|
| 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=""/> |
|---|
| 7 | <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> |
|---|
| 8 | <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/> |
|---|
| 9 | <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> |
|---|
| 10 | <classpathentry kind="lib" path="lib/jfcunit.jar"/> |
|---|
| 11 | <classpathentry kind="lib" path="lib/josm-translation.jar"/> |
|---|
| 12 | <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"/> |
|---|
| 20 | <classpathentry kind="output" path="bin"/> |
|---|
| 21 | </classpath> |
|---|
Note: See
TracBrowser
for help on using the repository browser.
