summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-17 10:09:27 -0800
committerPaul Phillips <paulp@improving.org>2012-02-17 10:09:27 -0800
commit7de7f13d9d60a0cfc67f63a5fa9d6f79b6a9a392 (patch)
treee9bcc933baee662152f654bb158a9fe1f3cd1c5f /test
parentb1870ae3670dc4faf85377a147e65ed45cf073f4 (diff)
parent219037f3701c12901a6e8c804ef0588f7a90dbb7 (diff)
parent178fdab8b613fc5ab0b3e3127e7e6f3a1e2da212 (diff)
parent6255c482572441e729a59e448adfa12d338752bc (diff)
downloadscala-7de7f13d9d60a0cfc67f63a5fa9d6f79b6a9a392.tar.gz
scala-7de7f13d9d60a0cfc67f63a5fa9d6f79b6a9a392.tar.bz2
scala-7de7f13d9d60a0cfc67f63a5fa9d6f79b6a9a392.zip
Merge remote-tracking branches 'VladUreche/issue/5005', 'adriaanm/topic/virtpatmat', 'dcsobral/ticket/5439' and 'magarciaEPFL/cleanInliner' into develop