diff options
author | Paul Phillips <paulp@improving.org> | 2011-12-02 05:56:20 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-12-02 05:56:50 -0800 |
commit | 8be1cfc777352a2e65344ebc1413dd9398379081 (patch) | |
tree | 15105d37bd12974815870264c380b84f2fdc24ff /test/files | |
parent | 989c0d0693e27d06d1f70524b66527d1ef12f5a2 (diff) | |
parent | 6ecca6d2b56918c202627bf95c40f3b7465bb808 (diff) | |
parent | 086b558f2d025323c86226b2560578c50ee48b84 (diff) | |
download | scala-8be1cfc777352a2e65344ebc1413dd9398379081.tar.gz scala-8be1cfc777352a2e65344ebc1413dd9398379081.tar.bz2 scala-8be1cfc777352a2e65344ebc1413dd9398379081.zip |
Merge remote-tracking branches 'szeiger/issue/2196', 'soc/SI-3481' and 'soc/scaladoc-spacing' into develop