diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-05 21:56:37 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-03-05 22:13:17 -0800 |
commit | 67f0694af926a92dba7522488a6d2f3d6eacbeef (patch) | |
tree | 26d1374c674b1c196f852dca06a0d8fbc5c49574 /test/simplejson | |
parent | 45cce6f2d1baf80de6c6e880fe875db5ef43cec8 (diff) | |
parent | 889020dfab9f99a3198528fedb699c061027acab (diff) | |
download | scala-67f0694af926a92dba7522488a6d2f3d6eacbeef.tar.gz scala-67f0694af926a92dba7522488a6d2f3d6eacbeef.tar.bz2 scala-67f0694af926a92dba7522488a6d2f3d6eacbeef.zip |
Merge 2.10.x into master.
Resurrect some undead code from 373ded2ad3 (tuple2Pickler).
Conflicts:
src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/simplejson')
0 files changed, 0 insertions, 0 deletions