diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:22:51 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-03 08:22:51 +1000 |
| commit | 21644611b3c676210d312eca1e0169d21070b50e (patch) | |
| tree | e732aa1f0b6b6d65c21e91b40298f722200593f7 /src/eclipse | |
| parent | 61dbf4ac711094db38a4b2dfb853d88499c2b1a5 (diff) | |
| parent | 91c4192c39d2bdebf37a97e41d374a39ece8af85 (diff) | |
| download | scala-21644611b3c676210d312eca1e0169d21070b50e.tar.gz scala-21644611b3c676210d312eca1e0169d21070b50e.tar.bz2 scala-21644611b3c676210d312eca1e0169d21070b50e.zip | |
Merge pull request #3959 from lrytz/merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
Merge 2.11 to 2.12
Diffstat (limited to 'src/eclipse')
| -rw-r--r-- | src/eclipse/repl/.classpath | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/eclipse/repl/.classpath b/src/eclipse/repl/.classpath index 601a231aeb..8ff9aabfbf 100644 --- a/src/eclipse/repl/.classpath +++ b/src/eclipse/repl/.classpath @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="repl"/> - <classpathentry combineaccessrules="false" kind="src" path="/asm"/> - <classpathentry kind="var" path="M2_REPO/jline/jline/2.11/jline-2.11.jar"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_COMPILER_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/repl/jline-2.11.jar"/> - <classpathentry kind="output" path="build-quick-repl"/> + <classpathentry kind="src" path="repl"/> + <classpathentry combineaccessrules="false" kind="src" path="/asm"/> + <classpathentry kind="var" path="M2_REPO/jline/jline/2.12/jline-2.12.jar"/> + <!-- <classpathentry kind="var" path="SCALA_BASEDIR/build/deps/repl/jline-2.12.jar"/> --> + <classpathentry combineaccessrules="false" kind="src" path="/scala-compiler"/> + <classpathentry combineaccessrules="false" kind="src" path="/scala-library"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="build-quick-repl"/> </classpath> |