Evgeny Gerashchenko af9f00c177 Merge branch 'decompiler' ...

Conflicts:
	compiler/backend/src/org/jetbrains/jet/codegen/NamespaceCodegen.java
	compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
	compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java

2012-03-14 14:50:04 +04:00

..

backend

Merge branch 'decompiler'

2012-03-14 14:50:04 +04:00

cli

FqName class

2012-03-13 21:51:38 +04:00

frontend

Merge branch 'decompiler'

2012-03-14 14:50:04 +04:00

frontend.java

Merge branch 'decompiler'

2012-03-14 14:50:04 +04:00

jet.as.java.psi

FqName class

2012-03-13 21:51:38 +04:00

testData

KT-1550 Cannot use parenthesized array access expression.

2012-03-14 13:19:02 +04:00

tests

FqName class

2012-03-13 21:51:38 +04:00

util

Copyrights set to Apache, reflecting it's now open source

2012-02-14 19:25:06 +04:00