summaryrefslogtreecommitdiff
path: root/test/disabled
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-17 20:15:00 -0800
committerPaul Phillips <paulp@improving.org>2012-02-17 20:15:00 -0800
commit08f9a19555b3d58a9dd965a1bbf239da6a9508b3 (patch)
treef875f9f6c78c12ce74bad2c61af5a507ebadba42 /test/disabled
parent2fe570291a41e2701f3118bc0f643a9fa60c476b (diff)
parentb10b5821f40ccfad5e97df754ec35be0d256e41e (diff)
parentb433bdba5aa7d8947032cc15454666c8a4a30115 (diff)
downloadscala-08f9a19555b3d58a9dd965a1bbf239da6a9508b3.tar.gz
scala-08f9a19555b3d58a9dd965a1bbf239da6a9508b3.tar.bz2
scala-08f9a19555b3d58a9dd965a1bbf239da6a9508b3.zip
Merge remote-tracking branches 'hubertp/issue/5452' and 'hubertp/issue/5493' into develop