Pavel V. Talanov 9dce8a9f33 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/RangesFIF.java
	js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java

2012-08-14 13:04:38 +04:00

..

android-tests

revert unsuccessful attempt to fix android build

2012-08-14 09:26:27 +03:00

backend

Fix android build

2012-08-14 12:25:06 +04:00

cli

Merge remote-tracking branch 'origin/master'

2012-08-14 13:04:38 +04:00

frontend

Merge remote-tracking branch 'origin/master'

2012-08-14 13:04:38 +04:00

frontend.java

proper compilation of enums

2012-08-13 22:37:27 +03:00

integration-tests

fix failing because of line endings test

2012-06-22 18:30:50 +04:00

jet.as.java.psi

Removed unused myProject field from IntrinsicMethods. Removed from injector parameters, etc.

2012-08-09 15:13:42 +04:00

testData

Fix android build

2012-08-14 12:25:06 +04:00

tests

Fix android build

2012-08-14 12:25:06 +04:00

util

Merge remote-tracking branch 'origin/master'

2012-08-14 13:04:38 +04:00