Evgeny Pasynkov ec79107c77 Merge branch 'master' into upsource-master ...

Conflicts:
	build/scripts/libLicenses.gant
	images/src/org/intellij/images/index/ImageInfoIndex.java
	java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
	java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
	jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
	jps/model/src/org/jetbrains/jps/idea/IdeaProjectLoader.groovy
	platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
	platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
	platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
	platform/platform-resources-en/src/messages/ActionsBundle.properties
	platform/util/src/com/intellij/icons/AllIcons.java
	plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
	plugins/java-i18n/src/com/intellij/spellchecker/LiteralExpressionTokenizer.java
	plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
	plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/EscapeSequenceTokenizer.java

2012-07-04 11:45:53 +02:00

..

src/com/intellij

Merge branch 'master' into upsource-master

2012-07-04 11:45:53 +02:00

java-impl.iml

move searchers to indexing module

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