diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-29 19:19:27 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-29 19:19:27 -0800 |
commit | 8484f35055ceb52a92b68e655ef7c0865b92343b (patch) | |
tree | 9ff1a9f8bc5595d509632e9c6e3d7abc25145f35 /test/files/run/inner-obj-auto.check | |
parent | 105dc63121c84a45711b02f77f8e4a04074f7425 (diff) | |
parent | cfb04ef065e9daf019e0d39339ff12a89cc6f0b5 (diff) | |
parent | 568546ef3f1073febc9bfc6baf63eceaf92213b6 (diff) | |
download | scala-8484f35055ceb52a92b68e655ef7c0865b92343b.tar.gz scala-8484f35055ceb52a92b68e655ef7c0865b92343b.tar.bz2 scala-8484f35055ceb52a92b68e655ef7c0865b92343b.zip |
Merge remote-tracking branches 'VladUreche/issue/5527' and 'dragos/master'