Merge branch 'master' of git://github.com/JetBrains/kotlin

2012-02-29 20:28:40 +04:00
parent d2ec50b9a9 28ff40e659
commit 6e1bf6ee40
30 changed files with 531 additions and 196 deletions
@@ -25,7 +25,7 @@ import java.util.Collections;
 /**
 * @author abreslav
 */
-public class ModuleDescriptor extends DeclarationDescriptorImpl {
+public class ModuleDescriptor extends DeclarationDescriptorImpl implements ClassOrNamespaceDescriptor {
    public ModuleDescriptor(String name) {
        super(null, Collections.<AnnotationDescriptor>emptyList(), name);
    }