diff options
author | Paul Phillips <paulp@improving.org> | 2012-02-23 08:31:36 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-02-23 08:31:36 -0800 |
commit | 329d99829d4e51d0847000439de595de7b565686 (patch) | |
tree | fcb1a43c55aedfa7a0832cac2573ae74ef378456 /test/files | |
parent | 6f4fca6833267a7ec6ea1aeea9f0dc60112ab715 (diff) | |
parent | 2f79c6ac6eadb26f12e35c49e0a2e6cb88f3dbff (diff) | |
parent | 5052b58089b711e7ddc481b0aa1989b1dc9f2bfa (diff) | |
parent | 7afd85b270d6d6b6db6f813e3b85deafd2b438bd (diff) | |
parent | f9f888d36a265052c67a2c486d569a4c75657eab (diff) | |
parent | 4cd1143d8d7b9619f45a4727042f71306b052da5 (diff) | |
download | scala-329d99829d4e51d0847000439de595de7b565686.tar.gz scala-329d99829d4e51d0847000439de595de7b565686.tar.bz2 scala-329d99829d4e51d0847000439de595de7b565686.zip |
Merge remote-tracking branches 'namin/add-test-for-finitary-error', 'namin/add-test-for-parent-inherited-twice-error', 'namin/add-test-for-constructor-prefix-error', 'namin/add-tests-for-qualifying-class-error', 'namin/add-test-for-abstraction-from-volatile-type-error' and 'axel22/issue/5293' into develop