Andrey Breslav fc4ee1ab13 Merge remote branch 'origin/master' ...

Conflicts:
	idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java

2011-09-06 12:14:07 +04:00

..

cfg

JET-140 Change function type syntax

2011-07-06 18:18:11 +04:00

checker

Better error recovery

2011-09-05 20:41:52 +04:00

codegen

Merge remote branch 'origin/master'

2011-09-06 12:14:07 +04:00

mockJDK-1.7

add GridBagConstraints

2011-04-15 13:05:39 +02:00

psi

preferBlock removed from JetTypeInferrer

2011-08-29 21:43:48 +04:00

resolve

Tests fixed, and error messages a little

2011-09-05 19:35:31 +04:00