diff options
-rw-r--r-- | build.number | 6 | ||||
-rw-r--r-- | build.xml | 2 | ||||
-rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/symtab/StdNames.scala | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/build.number b/build.number index db07a4109c..5aceba8bd4 100644 --- a/build.number +++ b/build.number @@ -1,5 +1,5 @@ #Tue Sep 11 19:21:09 CEST 2007 -version.minor=6 -version.patch=1 -version.suffix=-RC2 +version.minor=7 +version.patch=0 +version.suffix= version.major=2 @@ -1800,7 +1800,7 @@ GENERATES A DISTRIBUTION <quicksbaz file="${dist.dir}/scala-devel-docs-${version.number}.sbp" adfile="${dist.dir}/scala-devel-docs-${version.number}.advert" - name="scala-devel" + name="scala-devel-docs" version="${version.number}" desc="The Scala developer documentation. This contains all developer documentation." link="${sbaz.universe}/scala-devel-docs-${version.number}.sbp"> diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index c25fab0e6c..ddc0aa7f9a 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -abff2e45f1331c5e794712eb3b541d91977833c1 ?scala-compiler.jar +e673ab5c7cb0851dc000a1ad107ce028e91d9695 ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index 05aa01ab3f..2d3950460f 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -98df69d742b3323810c37fb9c36328c9bed50245 ?scala-library-src.jar +f1d7998695d653d4e1fa92db92a4ec8a6b0e42ef ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index ffa7465d0f..a5c8eccc2e 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -93774afad0ec5a940628a89348e097050bb25467 ?scala-library.jar +6df56a36bcb67b553acbd592b37ca5133b081dda ?scala-library.jar diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala index bb582faba1..70597eb5db 100644 --- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala +++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala @@ -265,6 +265,7 @@ trait StdNames { val classOf = newTermName("classOf") val coerce = newTermName("coerce") val defaultValue = newTermName("defaultValue") + val detach = newTermName("detach") val drop = newTermName("drop") val dummy = newTermName("$dummy") val elem = newTermName("elem") @@ -324,7 +325,6 @@ trait StdNames { val sameElements = newTermName("sameElements") val scala_ = newTermName("scala") val self = newTermName("self") - val send = newTermName("send") val synchronized_ = newTermName("synchronized") val tag = newTermName("$tag") val tail = newTermName("tail") |