summaryrefslogtreecommitdiff
path: root/test/files/run/t5277_2.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-02-01 15:24:07 -0800
committerPaul Phillips <paulp@improving.org>2012-02-01 15:24:07 -0800
commit3aebe255b87f534239f0c46a2a6e0d696c8a31d4 (patch)
tree47a50ac5d6973709b1850415b8f231610de7dd0c /test/files/run/t5277_2.check
parent68218fa678abfce9cce9f764e3cb9463ce6e0b85 (diff)
parent610027b3c50c6a46b26bcfe71013cebc172c146b (diff)
parent1e0707786b118e3e33379e7acdc75306b45e6547 (diff)
downloadscala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.tar.gz
scala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.tar.bz2
scala-3aebe255b87f534239f0c46a2a6e0d696c8a31d4.zip
Merge remote-tracking branches 'scalamacros/pullrequest/5258' and 'scalamacros/pullrequest/5256' into develop