diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 13:06:06 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 13:06:06 -0700 |
| commit | 1c061e5931ccc39090d955e3bc18dd0a1e48df84 (patch) | |
| tree | 4e351e3c3f3efa5a8e63c3d79bcb665d21d25630 /lib | |
| parent | a127aae2a5fbae146ea81e470541209436222970 (diff) | |
| parent | 54e284d669418ebc6445bd0ec66804b9067f6dd3 (diff) | |
| download | scala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.tar.gz scala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.tar.bz2 scala-1c061e5931ccc39090d955e3bc18dd0a1e48df84.zip | |
Merge remote-tracking branch 'odersky/topic/inline' into merge-inline
Conflicts:
lib/scala-compiler.jar.desired.sha1
lib/scala-library-src.jar.desired.sha1
lib/scala-library.jar.desired.sha1
src/compiler/scala/reflect/internal/Definitions.scala
src/compiler/scala/reflect/internal/Symbols.scala
src/compiler/scala/tools/nsc/Global.scala
src/compiler/scala/tools/nsc/transform/Constructors.scala
src/compiler/scala/tools/nsc/transform/Erasure.scala
src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
src/compiler/scala/tools/nsc/typechecker/Contexts.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
src/library/scala/Function0.scala
src/library/scala/Function1.scala
src/library/scala/Function10.scala
src/library/scala/Function11.scala
src/library/scala/Function12.scala
src/library/scala/Function13.scala
src/library/scala/Function14.scala
src/library/scala/Function15.scala
src/library/scala/Function16.scala
src/library/scala/Function17.scala
src/library/scala/Function18.scala
src/library/scala/Function19.scala
src/library/scala/Function2.scala
src/library/scala/Function20.scala
src/library/scala/Function21.scala
src/library/scala/Function22.scala
src/library/scala/Function3.scala
src/library/scala/Function4.scala
src/library/scala/Function5.scala
src/library/scala/Function6.scala
src/library/scala/Function7.scala
src/library/scala/Function8.scala
src/library/scala/Function9.scala
test/files/codelib/code.jar.desired.sha1
test/files/neg/anyval-children-2.check
test/files/run/programmatic-main.check
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scala-dbc.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | lib/scala-partest.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | lib/scala-swing.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | lib/scalacheck.jar.desired.sha1 | 1 | ||||
| -rw-r--r-- | lib/scalap.jar.desired.sha1 | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/lib/scala-dbc.jar.desired.sha1 b/lib/scala-dbc.jar.desired.sha1 new file mode 100644 index 0000000000..e51fef11e9 --- /dev/null +++ b/lib/scala-dbc.jar.desired.sha1 @@ -0,0 +1 @@ +4018c45556de9674348f1bcdef042bfecdde9cdb ?scala-dbc.jar diff --git a/lib/scala-partest.jar.desired.sha1 b/lib/scala-partest.jar.desired.sha1 new file mode 100644 index 0000000000..3e30ca7f99 --- /dev/null +++ b/lib/scala-partest.jar.desired.sha1 @@ -0,0 +1 @@ +d4d19b3891be3dd381066a83c4e35887b666dc27 ?scala-partest.jar diff --git a/lib/scala-swing.jar.desired.sha1 b/lib/scala-swing.jar.desired.sha1 new file mode 100644 index 0000000000..9ecf764e44 --- /dev/null +++ b/lib/scala-swing.jar.desired.sha1 @@ -0,0 +1 @@ +e40b7ecf7cc346dce9400ba9c85275548937fbdf ?scala-swing.jar diff --git a/lib/scalacheck.jar.desired.sha1 b/lib/scalacheck.jar.desired.sha1 new file mode 100644 index 0000000000..c9b189f0ab --- /dev/null +++ b/lib/scalacheck.jar.desired.sha1 @@ -0,0 +1 @@ +2c66d55c38859c50dcce39aeb1cd2611de7d9922 ?scalacheck.jar diff --git a/lib/scalap.jar.desired.sha1 b/lib/scalap.jar.desired.sha1 new file mode 100644 index 0000000000..789a17cda5 --- /dev/null +++ b/lib/scalap.jar.desired.sha1 @@ -0,0 +1 @@ +0232fc4d34d65dc2a177b7eb9eb935bb156207ff ?scalap.jar |