summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-11-13 11:49:45 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-11-13 11:49:45 -0800
commit2321072c8f795d6b20a9ab552bdac8dd6c731b66 (patch)
tree8d2dd8f5f6807d81a4ea21c15ff97ce8df404c6a /test
parentcb905907d5c7373fcfd0fffbe27188dcfc27e7b4 (diff)
parent075f6f260ccfba83b118c308195d1ede2e66ad18 (diff)
parente09a8a2b7f821be43703bd5bf3a064e171d8f66c (diff)
downloadscala-2321072c8f795d6b20a9ab552bdac8dd6c731b66.tar.gz
scala-2321072c8f795d6b20a9ab552bdac8dd6c731b66.tar.bz2
scala-2321072c8f795d6b20a9ab552bdac8dd6c731b66.zip
Merge commit '075f6f260c'; commit 'e09a8a2b7f' into merge-2.10