diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-11 12:54:42 -0400 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-11 13:23:33 -0400 |
commit | ee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97 (patch) | |
tree | f4876b92b514e724edaad88034df207222ed0e89 /test/scaladoc | |
parent | 79e937bea265675c73bca753ba74dc1a829b8737 (diff) | |
parent | 29bcadefb451bbf546e6f763027dac16f5b6f51b (diff) | |
parent | 292a861ca83b85e1b7c6a1e673c8710930aadc22 (diff) | |
download | scala-ee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97.tar.gz scala-ee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97.tar.bz2 scala-ee51b6e1b1bc4bd60e6f6bbaea6eb3d4be8b3c97.zip |
Merge remote-tracking branches 'adriaanm/ticket/5189' and 'jsuereth/better-starr-flow' into develop