diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-26 14:49:01 +0200 |
commit | e27d024c386c817030d872b9773171598e11dd8d (patch) | |
tree | 6070bb44e3c87be079040dbf1e25f5bb2756703a /src/eclipse/repl/.classpath | |
parent | 771724494d4a7e73542c04e8e0b50523745fb7a8 (diff) | |
parent | 47908f19e064151140e32819c2edd9e68b34dd0c (diff) | |
download | scala-e27d024c386c817030d872b9773171598e11dd8d.tar.gz scala-e27d024c386c817030d872b9773171598e11dd8d.tar.bz2 scala-e27d024c386c817030d872b9773171598e11dd8d.zip |
Merge remote-tracking branch 'upstream/2.11.x' into backports
Conflicts:
src/library/scala/util/matching/Regex.scala
Diffstat (limited to 'src/eclipse/repl/.classpath')
-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> |