diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-25 16:03:11 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-25 16:03:11 +0200 |
commit | 2c1d1ad26dd23fe619d6af25d642c7adf7af143b (patch) | |
tree | dd2f32e7ed9a31702fb70953e6be2b746da57b84 /src/eclipse/scaladoc/.classpath | |
parent | cdc011f9aefc030057575ec075f3c657c92f23de (diff) | |
parent | 6eef42e0ee0bd57c061503fe81580322d1b23641 (diff) | |
download | scala-2c1d1ad26dd23fe619d6af25d642c7adf7af143b.tar.gz scala-2c1d1ad26dd23fe619d6af25d642c7adf7af143b.tar.bz2 scala-2c1d1ad26dd23fe619d6af25d642c7adf7af143b.zip |
Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22
Merge 2.11 to 2.12 apr 22
Diffstat (limited to 'src/eclipse/scaladoc/.classpath')
-rw-r--r-- | src/eclipse/scaladoc/.classpath | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/eclipse/scaladoc/.classpath b/src/eclipse/scaladoc/.classpath index 3a3ebf7799..870d1da61d 100644 --- a/src/eclipse/scaladoc/.classpath +++ b/src/eclipse/scaladoc/.classpath @@ -2,13 +2,12 @@ <classpath> <classpathentry kind="src" path="scaladoc"/> <classpathentry kind="var" path="SCALA_BASEDIR/lib/ant/ant.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> - <classpathentry combineaccessrules="false" kind="src" path="/partest-extras"/> - <classpathentry kind="var" path="M2_REPO/org/scala-lang/modules/scala-xml_2.12.0-M2/1.0.5/scala-xml_2.12.0-M2-1.0.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scala-lang/modules/scala-parser-combinators_2.12.0-M2/1.0.4/scala-parser-combinators_2.12.0-M2-1.0.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/scala-lang/modules/scala-partest_2.12.0-M2/1.0.9/scala-partest_2.12.0-M2-1.0.9.jar"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/asm/scala-asm-5.0.4-scala-3.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-xml_2.12.0_M4-1.0.5.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/scaladoc/scala-parser-combinators_2.12.0_M4-1.0.4.jar"/> + <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/partest/scala-partest_2.12.0_M4-1.0.13.jar"/> <classpathentry kind="output" path="build-quick-scaladoc"/> </classpath> |