Merge branch 'master' into build-tools

2012-01-16 21:18:34 +02:00
parent 2522cbc9c8 d51c030803
commit 1fc1301cb2
65 changed files with 1169 additions and 1024 deletions
@@ -24,6 +24,9 @@
            <include name="frontend.java/src"/>
            <include name="backend/src"/>
            <include name="cli/src"/>
+<!--
+            <include name="jet.as.java.psi/src"/>
+-->
        </dirset>
    </path>