summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-30 08:13:26 -0800
committerPaul Phillips <paulp@improving.org>2012-01-30 08:13:26 -0800
commitbf2ec290d9bf1a75daa0f56081a99dc2f69e2670 (patch)
tree15945fbf3af65086a80d616fedb90c6d2006cfc6 /test
parent5725b2562070f9c37d5ca51008ddef0457a37121 (diff)
parent5f4c97c448f161b3bab7ae3271e30620eb9bea76 (diff)
parent58679b953933494b5f06d61e82257391bba4091c (diff)
downloadscala-bf2ec290d9bf1a75daa0f56081a99dc2f69e2670.tar.gz
scala-bf2ec290d9bf1a75daa0f56081a99dc2f69e2670.tar.bz2
scala-bf2ec290d9bf1a75daa0f56081a99dc2f69e2670.zip
Merge remote-tracking branches 'axel22/issue/4147', 'axel22/issue/5374' and 'hubertp/ticket/4336' into develop