diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-05 13:32:08 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-09-05 13:32:08 -0700 |
| commit | 46335e4d7433bfb8e275b4afb3694c7c6d07b767 (patch) | |
| tree | 5bcb9cd608f61082ecae6bfd9477a5fdb097c569 /build.xml | |
| parent | 5044f1c1e863ca75c6f49462d370e48b51f3e8c7 (diff) | |
| parent | d46519da657ada39d9928308709cdb80ddcd53ce (diff) | |
| download | scala-46335e4d7433bfb8e275b4afb3694c7c6d07b767.tar.gz scala-46335e4d7433bfb8e275b4afb3694c7c6d07b767.tar.bz2 scala-46335e4d7433bfb8e275b4afb3694c7c6d07b767.zip | |
Merge remote-tracking branch 'scala/2.10.x' into merge-2.10.x
Conflicts:
bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
src/reflect/scala/reflect/internal/SymbolTable.scala
src/reflect/scala/reflect/internal/util/WeakHashSet.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1326,9 +1326,11 @@ TODO: <attribute name="Class-Path" value="scala-reflect.jar scala-library.jar"/> </manifest> </pre> + <!-- script api is 2.11-only so far <jar-opts> <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/> </jar-opts> + --> </staged-pack> </target> |