diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-01 15:24:07 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-01 15:24:07 -0800 |
commit | 3aebe255b87f534239f0c46a2a6e0d696c8a31d4 (patch) | |
tree | 47a50ac5d6973709b1850415b8f231610de7dd0c /test | |
parent | 68218fa678abfce9cce9f764e3cb9463ce6e0b85 (diff) | |
parent | 610027b3c50c6a46b26bcfe71013cebc172c146b (diff) | |
parent | 1e0707786b118e3e33379e7acdc75306b45e6547 (diff) | |
download | scala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.tar.gz scala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.tar.bz2 scala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.zip |
Merge remote-tracking branches 'scalamacros/pullrequest/5258' and 'scalamacros/pullrequest/5256' into develop