summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-06 12:13:35 -0800
committerPaul Phillips <paulp@improving.org>2012-12-06 12:13:35 -0800
commit330c77b097782ed389a83175302379ea72d22c41 (patch)
tree8c7a1eb9f25d724b27d5ca33704ccb43bc0a7cb9 /README.rst
parentb1cb6578bdbdfaa66d3cf09f40dfc1511f7e9711 (diff)
parent06844ee821ae500c7485498cc2054e3cf765623f (diff)
downloadscala-330c77b097782ed389a83175302379ea72d22c41.tar.gz
scala-330c77b097782ed389a83175302379ea72d22c41.tar.bz2
scala-330c77b097782ed389a83175302379ea72d22c41.zip
Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete
* commit 'refs/pull/1717/head': SI-6769 Removes GenJVM backend Conflicts: src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst1
1 files changed, 0 insertions, 1 deletions
diff --git a/README.rst b/README.rst
index 72c4b6028b..7a1ed1dcf4 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,6 @@ build script or user-created if needed. This is not a complete listing. ::
+--dist/ The destination folder for Scala distributions.
+--docs/ Documentation and sample code.
+--lib/ Pre-compiled libraries for the build.
- | +--fjbg.jar The Java byte-code generation library.
| +--scala-compiler.jar The stable reference ('starr') compiler jar
| +--scala-library.jar The stable reference ('starr') library jar
| +--scala-library-src.jar A snapshot of the source used to build starr.