summaryrefslogtreecommitdiff
path: root/test/disabled
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-26 11:19:10 -0800
committerPaul Phillips <paulp@improving.org>2013-01-26 11:19:10 -0800
commit72f36cbc80d5667c5ada3b7c0fe60435a4b202ad (patch)
treeb5dd29c21822f4dd6d3064dc1a734a45ca3a712c /test/disabled
parentf01af109ae975461fe5a3120a69814521968fcce (diff)
parentcc067e6508546d3b830422d57034210489a54151 (diff)
downloadscala-72f36cbc80d5667c5ada3b7c0fe60435a4b202ad.tar.gz
scala-72f36cbc80d5667c5ada3b7c0fe60435a4b202ad.tar.bz2
scala-72f36cbc80d5667c5ada3b7c0fe60435a4b202ad.zip
Merge pull request #1974 from paulp/pr/merge-2.10
Merge 2.10.x into master.
Diffstat (limited to 'test/disabled')
0 files changed, 0 insertions, 0 deletions