Evgeny Pasynkov 00ae28fcae Merge branch 'upsource-master' ...

Conflicts:
	java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
	plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java

2012-07-04 11:48:36 +02:00

..

src/com/intellij

Merge branch 'upsource-master'

2012-07-04 11:48:36 +02:00

java-impl.iml

move searchers to indexing module

2012-06-22 08:55:07 +02:00