diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-05 12:51:03 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-05 12:51:03 -0800 |
commit | afc7ca99c75fc819b388cbae0bc98cacd03c940c (patch) | |
tree | 8ce0edd5e821cfca7ab988d10e22f1f6c64bcb7e /test | |
parent | 34f550aa6152ca3c035881aac53682e4d7b296c7 (diff) | |
parent | 908be8f709dbeeecff01863215f1d43c6ed59e1c (diff) | |
parent | 3cfbfa3d0edfca34fd5f5038afc826ea26e11ffb (diff) | |
download | scala-afc7ca99c75fc819b388cbae0bc98cacd03c940c.tar.gz scala-afc7ca99c75fc819b388cbae0bc98cacd03c940c.tar.bz2 scala-afc7ca99c75fc819b388cbae0bc98cacd03c940c.zip |
Merge remote-tracking branches 'szabolcsberecz/backports/fix-specialized-tests' and 'szabolcsberecz/backports/SI-5380' into develop-2.9.x