diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-27 07:31:28 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-27 07:31:28 -0700 |
| commit | d078b58961014c5eaa7540c4cec733679dc8965c (patch) | |
| tree | fef989b57b346fef20481d5c42d78884294e0deb /build.xml | |
| parent | e8db5aa6aee134b4b70fcc11c82379759565b53c (diff) | |
| parent | 1c0bef88383a13f6bf6e52f9f9fc82c814dbdacb (diff) | |
| parent | 83d9d7e6506986db3f34eb8a9055707e24437e2a (diff) | |
| parent | 4b0d4571ecc8cfb1550c24a2cf11c8d0d535c36f (diff) | |
| parent | 2e64b73a1da104363fa948e6969990e893eb2bed (diff) | |
| parent | 5632167f6cacec16d82b1961d233d7e761cf6036 (diff) | |
| download | scala-d078b58961014c5eaa7540c4cec733679dc8965c.tar.gz scala-d078b58961014c5eaa7540c4cec733679dc8965c.tar.bz2 scala-d078b58961014c5eaa7540c4cec733679dc8965c.zip | |
Merge remote-tracking branches 'manojo/issue/4488', 'leifwickland/patch-3', 'non/si-5609', 'adriaanm/topic/virtpatmat' and 'VladUreche/issue/5373' into develop
Conflicts:
test/scaladoc/scala/model/CommentFactoryTest.scala