diff options
| author | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-28 19:48:31 +0200 |
|---|---|---|
| committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-06-28 19:48:31 +0200 |
| commit | b379ff4f59c139ff7d2b77e7e808f0b74aa9f268 (patch) | |
| tree | d531663cc08c71cc2631c119403af3032c71b543 /classpath.SAMPLE | |
| parent | 2f0d94c02ab328a3f8da25b5ab8f402a68143af3 (diff) | |
| parent | 6f08c06a35a0b70c49e23a296b13ac391a460584 (diff) | |
| download | scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.tar.gz scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.tar.bz2 scala-b379ff4f59c139ff7d2b77e7e808f0b74aa9f268.zip | |
Merge branch 'master' into issue/5846,4597,4027,4112
Conflicts:
src/library/scala/collection/MapLike.scala
src/library/scala/collection/SortedMapLike.scala
Diffstat (limited to 'classpath.SAMPLE')
| -rw-r--r-- | classpath.SAMPLE | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/classpath.SAMPLE b/classpath.SAMPLE deleted file mode 100644 index 9e607a41d9..0000000000 --- a/classpath.SAMPLE +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/compiler"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="lib/msil.jar"/> - <classpathentry kind="lib" path="lib/jline.jar"/> - <classpathentry kind="lib" path="lib/fjbg.jar"/> - <classpathentry kind="lib" path="lib/forkjoin.jar"/> - <classpathentry kind="lib" path="lib/ant/ant.jar"/> - <classpathentry kind="output" path="build/quick/classes/compiler"/> -</classpath> |