Merge remote-tracking branch 'aosp/upstream-master' into merge

This merges in idea/136.1685.

Conflicts:
	.idea/compiler.xml
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea/modules.xml
	build.txt
	build/conf/mac/Contents/MacOS/idea
	build/scripts/dist.gant
	build/scripts/layouts.gant
	build/scripts/libLicenses.gant
	build/scripts/utils.gant
	community-main.iml
	community-resources/src/idea/IdeaApplicationInfo.xml
	community-resources/src/idea_community_about.png
	community-resources/src/idea_community_about@2x.png
	community-resources/src/idea_community_logo.png
	community-resources/src/idea_community_logo@2x.png
	java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
	java/debugger/impl/src/com/intellij/debugger/actions/JumpToObjectAction.java
	java/debugger/impl/src/com/intellij/debugger/actions/JvmSmartStepIntoHandler.java
	java/debugger/impl/src/com/intellij/debugger/engine/CompoundPositionManager.java
	java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
	java/debugger/impl/src/com/intellij/debugger/engine/requests/RequestManagerImpl.java
	java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
	java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java
	java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
	java/debugger/impl/src/com/intellij/debugger/ui/JavaDebuggerSupport.java
	java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByClassRule.java
	java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByPackageRule.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaBreakpointTypeBase.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaFieldBreakpointType.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaLineBreakpointTypeBase.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaMethodBreakpointType.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/RunToCursorBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/StepIntoBreakpoint.java
	java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
	java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java
	java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java
	java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
	java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java
	java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
	java/idea-ui/src/com/intellij/ide/projectWizard/ModuleTypeCategory.java
	java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.form
	java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
	java/idea-ui/src/com/intellij/ide/projectWizard/TemplateBasedCategory.java
	java/idea-ui/src/com/intellij/ide/util/frameworkSupport/AddFrameworkSupportDialog.java
	java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddSupportForFrameworksPanel.java
	java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SupportForFrameworksStep.java
	java/idea-ui/src/com/intellij/ide/util/newProjectWizard/TemplatesGroup.java
	java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java
	java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryRootsComponent.java
	java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java
	java/java-analysis-api/src/com/intellij/codeInsight/intention/QuickFixFactory.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java
	java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
	java/java-analysis-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
	java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
	java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeMethodReferenceInspection.java
	java/java-analysis-impl/src/com/intellij/codeInspection/LambdaCanBeMethodReferenceInspection.java
	java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
	java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
	java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
	java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
	java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StateMerger.java
	java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
	java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
	java/java-analysis-impl/src/com/intellij/codeInspection/java15api/api1.8.txt
	java/java-analysis-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspectionBase.java
	java/java-impl/java-impl.iml
	java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
	java/java-impl/src/com/intellij/codeInsight/completion/LambdaCompletionProvider.java
	java/java-impl/src/com/intellij/codeInsight/completion/MethodReferenceCompletionProvider.java
	java/java-impl/src/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java
	java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPassFactory.java
	java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java
	java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplateLookupElement.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplatesCompletionProvider.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesConfigurable.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesListPanel.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ExpressionPostfixTemplateWithChooser.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/PostfixLiveTemplate.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/ReturnStatementPostfixTemplate.java
	java/java-impl/src/com/intellij/codeInsight/template/postfix/util/PostfixTemplatesUtils.java
	java/java-impl/src/com/intellij/codeInspection/inferNullity/NullityInferrer.java
	java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
	java/java-impl/src/com/intellij/psi/formatter/java/JavaFormatterUtil.java
	java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
	java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
	java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
	java/java-impl/src/com/intellij/refactoring/typeMigration/ui/TypeMigrationDialog.java
	java/java-impl/src/com/intellij/spi/SPIFileType.java
	java/java-impl/src/com/intellij/util/xml/CanonicalPsiTypeConverterImpl.java
	java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
	java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
	java/java-psi-api/src/com/intellij/psi/PsiNameHelper.java
	java/java-psi-api/src/com/intellij/psi/infos/CandidateInfo.java
	java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
	java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
	java/java-psi-api/src/com/intellij/psi/util/TypesDistinctProver.java
	java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
	java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/PsiSubstitutorImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
	java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeElementImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
	java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceVariable.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
	java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
	java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
	java/java-structure-view/src/com/intellij/ide/structureView/impl/AddAllMembersProcessor.java
	java/java-tests/java-tests.iml
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/UnsupportedFeatures7.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguityRawGenerics.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/AmbiguitySpecificReturn.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/TypeArgsConsistency.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/MethodRefAcceptance.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA119535.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/AfterDistinctOps.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/AssertNumberOfParameters.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/GenericArrayCreation.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterFinalFieldInitializedBeforeAnonymInConstructor.java
	java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterForwardStaticFieldReference.java
	java/java-tests/testData/refactoring/introduceVariable/LambdaExprNotAccepted.after.java
	java/java-tests/testSrc/com/intellij/codeInsight/ClsGenericsHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/completion/HippieCompletionTest.groovy
	java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
	java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Interface8MethodsHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MostSpecificResolutionTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/AddExceptionToThrowsTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFoldingTest.groovy
	java/java-tests/testSrc/com/intellij/codeInsight/generation/surroundWith/JavaSurroundWithTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/intention/SplitDeclarationTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
	java/java-tests/testSrc/com/intellij/codeInsight/template/postfix/completion/TemplatesCompletionTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/template/postfix/templates/CastPostfixTemplateTest.java
	java/java-tests/testSrc/com/intellij/codeInsight/template/postfix/templates/NotNullPostfixTemplateTest.java
	java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionTest.java
	java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
	java/java-tests/testSrc/com/intellij/index/IndexTest.java
	java/java-tests/testSrc/com/intellij/openapi/editor/impl/JavaFileEditorManagerTest.java
	java/java-tests/testSrc/com/intellij/openapi/roots/impl/DirectoryIndexTest.java
	java/java-tests/testSrc/com/intellij/psi/ClsMirrorBuildingTest.java
	java/java-tests/testSrc/com/intellij/psi/ConstantValuesTest.java
	java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterSpaceTest.java
	java/java-tests/testSrc/com/intellij/psi/formatter/java/JavaFormatterWrapTest.java
	java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java
	java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
	java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java
	java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/BuildOperations.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/FileCopyingHandler.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.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/testSrc/org/jetbrains/ether/CommonTest.java
	jps/model-impl/src/org/jetbrains/jps/service/impl/JpsServiceManagerImpl.java
	jps/model-serialization/jps-serialization-tests.iml
	jps/model-serialization/src/com/intellij/openapi/components/ExpandMacroToPathMap.java
	lib/netty-all-5.0.0.Alpha2.jar
	lib/required_for_dist.txt
	lib/src/netty-all-5.0.0.Alpha2-sources.jar
	native/MacLauncher/Launcher.m
	native/MacLauncher/MacLauncher.xcodeproj/project.pbxproj
	platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoType.java
	platform/bootstrap/src/com/intellij/idea/Main.java
	platform/core-api/src/com/intellij/openapi/application/RunResult.java
	platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
	platform/core-api/src/com/intellij/openapi/editor/colors/TextAttributesKey.java
	platform/core-api/src/com/intellij/openapi/fileTypes/LanguageFileType.java
	platform/core-api/src/com/intellij/openapi/util/AsyncResult.java
	platform/core-api/src/com/intellij/openapi/util/AsyncValueLoader.java
	platform/core-api/src/com/intellij/openapi/util/AsyncValueLoaderManager.java
	platform/core-api/src/com/intellij/openapi/vfs/StandardFileSystems.java
	platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
	platform/core-api/src/com/intellij/psi/CommonClassNames.java
	platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
	platform/core-impl/src/com/intellij/mock/MockApplicationEx.java
	platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java
	platform/core-impl/src/com/intellij/openapi/editor/impl/DocumentImpl.java
	platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
	platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java
	platform/core-impl/src/com/intellij/psi/impl/cache/CacheUtil.java
	platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
	platform/core-impl/src/com/intellij/psi/stubs/StubTreeBuilder.java
	platform/core-impl/src/com/intellij/util/CompressionUtil.java
	platform/core-impl/src/com/intellij/util/DocumentUtil.java
	platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
	platform/dvcs/src/com/intellij/dvcs/ui/CloneDvcsDialog.form
	platform/dvcs/src/com/intellij/dvcs/ui/CloneDvcsDialog.java
	platform/dvcs/src/com/intellij/dvcs/ui/DvcsBundle.properties
	platform/editor-ui-api/src/com/intellij/ide/ui/UISettings.java
	platform/editor-ui-api/src/com/intellij/openapi/editor/CaretModel.java
	platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java
	platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/PersistentRangeHighlighterImpl.java
	platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionPointImpl.java
	platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/AbstractExternalSystemSettings.java
	platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java
	platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java
	platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ContentRootDataService.java
	platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java
	platform/icons/src/ide/sharedScope.png
	platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java
	platform/indexing-impl/src/com/intellij/ide/highlighter/custom/tokens/KeywordParser.java
	platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java
	platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
	platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java
	platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java
	platform/lang-api/src/com/intellij/ide/util/projectWizard/AbstractModuleBuilder.java
	platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
	platform/lang-api/src/com/intellij/psi/AbstractElementManipulator.java
	platform/lang-impl/lang-impl.iml
	platform/lang-impl/src/com/intellij/codeInsight/actions/AbstractLayoutCodeProcessor.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatFilesDialog.form
	platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatFilesDialog.java
	platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
	platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
	platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
	platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
	platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocOnMouseOverManager.java
	platform/lang-impl/src/com/intellij/codeInsight/editorActions/BaseEnterHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/intention/impl/QuickEditHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/BackspaceHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/EndHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/HomeHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupActionHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/navigation/IncrementalSearchHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/preview/ImageOrColorPreviewManager.java
	platform/lang-impl/src/com/intellij/codeInsight/template/CustomLiveTemplateBase.java
	platform/lang-impl/src/com/intellij/codeInsight/template/CustomTemplateCallback.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/InvokeTemplateAction.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateSettingsEditor.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/TableSorter.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
	platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EnterHandler.java
	platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
	platform/lang-impl/src/com/intellij/execution/console/BaseConsoleExecuteActionHandler.java
	platform/lang-impl/src/com/intellij/execution/console/ConsoleExecuteAction.java
	platform/lang-impl/src/com/intellij/execution/console/GutterContentProvider.java
	platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleBuilder.java
	platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
	platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
	platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java
	platform/lang-impl/src/com/intellij/execution/impl/RunManagerImpl.java
	platform/lang-impl/src/com/intellij/find/impl/FindInProjectTask.java
	platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
	platform/lang-impl/src/com/intellij/formatting/FormatterImpl.java
	platform/lang-impl/src/com/intellij/ide/GeneratedSourceFileChangeTrackerImpl.java
	platform/lang-impl/src/com/intellij/ide/actions/NewElementAction.java
	platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
	platform/lang-impl/src/com/intellij/ide/scratch/CreateScratchFileAction.java
	platform/lang-impl/src/com/intellij/injected/editor/CaretModelWindow.java
	platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectAllOccurrencesAction.java
	platform/lang-impl/src/com/intellij/openapi/editor/actions/SelectNextOccurrenceAction.java
	platform/lang-impl/src/com/intellij/openapi/editor/actions/UnselectPreviousOccurrenceAction.java
	platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeManager.java
	platform/lang-impl/src/com/intellij/openapi/file/exclude/ui/MarkAsOriginalTypeAction.java
	platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
	platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java
	platform/lang-impl/src/com/intellij/openapi/roots/impl/RootIndex.java
	platform/lang-impl/src/com/intellij/openapi/vcs/checkin/RearrangeBeforeCheckinHandler.java
	platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java
	platform/lang-impl/src/com/intellij/psi/impl/include/FileIncludeIndex.java
	platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
	platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
	platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
	platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java
	platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
	platform/lang-impl/src/com/intellij/refactoring/rename/inplace/InplaceRefactoring.java
	platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java
	platform/lang-impl/src/com/intellij/ui/IconDeferrerImpl.java
	platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
	platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
	platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java
	platform/lang-impl/src/com/intellij/util/indexing/IndexInfrastructure.java
	platform/lang-impl/src/com/intellij/util/indexing/IndexingStamp.java
	platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
	platform/lang-impl/src/com/intellij/util/indexing/MapReduceIndex.java
	platform/lang-impl/src/com/intellij/util/indexing/UnindexedFilesUpdater.java
	platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
	platform/platform-api/platform-api.iml
	platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
	platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
	platform/platform-api/src/com/intellij/ide/BrowserUtil.java
	platform/platform-api/src/com/intellij/ide/browsers/BrowserLauncher.java
	platform/platform-api/src/com/intellij/ide/browsers/BrowserSpecificSettings.java
	platform/platform-api/src/com/intellij/ide/browsers/firefox/FirefoxSettings.java
	platform/platform-api/src/com/intellij/openapi/editor/EditorModificationUtil.java
	platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java
	platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorActionHandler.java
	platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorWriteActionHandler.java
	platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptorBuilder.java
	platform/platform-api/src/com/intellij/openapi/ui/MessageType.java
	platform/platform-api/src/com/intellij/openapi/ui/Messages.java
	platform/platform-api/src/com/intellij/openapi/vfs/JarFileSystem.java
	platform/platform-api/src/com/intellij/openapi/vfs/newvfs/RefreshQueue.java
	platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java
	platform/platform-api/src/com/intellij/openapi/wm/IdeGlassPaneUtil.java
	platform/platform-api/src/com/intellij/ui/mac/MacMessages.java
	platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
	platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java
	platform/platform-api/src/com/intellij/util/Alarm.java
	platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
	platform/platform-api/src/com/intellij/util/net/ssl/CertificateConfigurable.form
	platform/platform-api/src/com/intellij/util/net/ssl/CertificateConfigurable.java
	platform/platform-api/src/com/intellij/util/net/ssl/CertificateInfoPanel.java
	platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java
	platform/platform-api/src/com/intellij/util/net/ssl/ConfirmingHostnameVerifier.java
	platform/platform-api/src/com/intellij/util/net/ssl/ConfirmingTrustManager.java
	platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
	platform/platform-impl/src/com/intellij/execution/process/RunnerWinProcess.java
	platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
	platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java
	platform/platform-impl/src/com/intellij/ide/actions/AboutDialog.java
	platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java
	platform/platform-impl/src/com/intellij/ide/actions/TogglePresentationModeAction.java
	platform/platform-impl/src/com/intellij/ide/dnd/FileCopyPasteUtil.java
	platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java
	platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
	platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginsManagerMain.java
	platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java
	platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
	platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.form
	platform/platform-impl/src/com/intellij/ide/plugins/PluginHeaderPanel.java
	platform/platform-impl/src/com/intellij/ide/plugins/PluginManager.java
	platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form
	platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
	platform/platform-impl/src/com/intellij/ide/plugins/PluginTable.java
	platform/platform-impl/src/com/intellij/ide/plugins/PluginsTableRenderer.form
	platform/platform-impl/src/com/intellij/ide/plugins/PluginsTableRenderer.java
	platform/platform-impl/src/com/intellij/ide/ui/EditorOptionDescription.java
	platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
	platform/platform-impl/src/com/intellij/ide/util/TipUIUtil.java
	platform/platform-impl/src/com/intellij/idea/StartupUtil.java
	platform/platform-impl/src/com/intellij/internal/ToggleDumbModeAction.java
	platform/platform-impl/src/com/intellij/openapi/application/ex/ApplicationInfoEx.java
	platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
	platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/CloneCaretAbove.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/CloneCaretBelow.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/CutLineEndAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/EscapeAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/MoveCaretDownWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/MoveCaretUpWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/PageDownWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/PageUpWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/TextEndWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/actions/TextStartWithSelectionAction.java
	platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java
	platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
	platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentCaretModel.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/BaseRemoteFileEditor.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/TrailingSpacesStripper.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/HttpFileEditor.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
	platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorProvider.java
	platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java
	platform/platform-impl/src/com/intellij/openapi/keymap/impl/GenericKeymapManager.java
	platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcher.java
	platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
	platform/platform-impl/src/com/intellij/openapi/project/CacheUpdateRunner.java
	platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateInfoDialog.java
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.java
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateCheckerComponent.java
	platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
	platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java
	platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/DefaultRemoteContentProvider.java
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/FileNameCache.java
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
	platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeMenuBar.java
	platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
	platform/platform-impl/src/com/intellij/openapi/wm/impl/WindowManagerImpl.java
	platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
	platform/platform-impl/src/com/intellij/platform/PlatformProjectOpenProcessor.java
	platform/platform-impl/src/com/intellij/psi/impl/UrlPsiReference.java
	platform/platform-impl/src/com/intellij/remote/RemoteConnectionCredentialsWrapper.java
	platform/platform-impl/src/com/intellij/remote/RemoteCredentialsHolder.java
	platform/platform-impl/src/com/intellij/remote/RemoteSdkAdditionalData.java
	platform/platform-impl/src/com/intellij/remote/RemoteSdkCredentialsHolder.java
	platform/platform-impl/src/com/intellij/remote/WebDeploymentCredentialsHolder.java
	platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
	platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java
	platform/platform-impl/src/com/intellij/ui/LibNotifyWrapper.java
	platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
	platform/platform-impl/src/com/intellij/ui/mac/MacMessagesImpl.java
	platform/platform-impl/src/com/intellij/ui/messages/JBMacMessages.java
	platform/platform-impl/src/com/intellij/ui/messages/SheetController.java
	platform/platform-impl/src/com/intellij/ui/messages/SheetMessage.java
	platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
	platform/platform-resources-en/src/messages/ActionsBundle.properties
	platform/platform-resources-en/src/messages/ApplicationBundle.properties
	platform/platform-resources-en/src/messages/DiffBundle.properties
	platform/platform-resources-en/src/misc/registry.properties
	platform/platform-resources-en/src/tips/FinishByControlEnter.html
	platform/platform-resources/src/META-INF/LangExtensions.xml
	platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
	platform/platform-resources/src/META-INF/VcsExtensions.xml
	platform/platform-resources/src/brokenPlugins.txt
	platform/platform-resources/src/componentSets/Platform.xml
	platform/platform-resources/src/idea/Keymap_Default.xml
	platform/platform-resources/src/idea/PlatformActions.xml
	platform/platform-tests/testData/editor/multiCaret/EditorEscape-after.txt
	platform/platform-tests/testData/editor/multiCaret/EditorTab-after.txt
	platform/platform-tests/testData/editor/multiCaret/EditorToggleCase-after.txt
	platform/platform-tests/testSrc/com/intellij/history/integration/ActionsTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretColumnModeTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretStateRestoreTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/EditorMultiCaretUndoRedoTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/StripTrailingSpacesTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/EditorMultiCaretActionTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/IndentSelectionActionTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/SelectUnselectOccurrenceActionsTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/actions/ToggleColumnModeActionMultiCaretTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/AbstractEditorTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorImplTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorLastActionTrackerTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/IterationStateTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileEditorManagerTestCase.java
	platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/EnforcedPlaintTextFileTypeManagerTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/IdeMouseEventDispatcherTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/keymap/impl/ui/ActionsTreeTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java
	platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/PersistentFsTest.java
	platform/platform-tests/testSrc/com/intellij/ui/FinderRecursivePanelSelectionUpdateTest.java
	platform/platform-tests/testSrc/com/intellij/util/net/ssl/CertificateTest.java
	platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java
	platform/projectModel-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java
	platform/remote-servers/impl/resources/resources/cloud.properties
	platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionManagerImpl.java
	platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudAccountSelectionEditor.java
	platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudConnectionTask.java
	platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudNotifier.java
	platform/remote-servers/impl/src/com/intellij/remoteServer/util/CloudSupportConfigurableBase.java
	platform/testFramework/src/com/intellij/idea/IdeaTestApplication.java
	platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java
	platform/testFramework/src/com/intellij/testFramework/IdeResourcesTestCase.java
	platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java
	platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
	platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
	platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestUtil.java
	platform/testFramework/src/com/intellij/testFramework/fixtures/EditorMouseFixture.java
	platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
	platform/usageView/src/com/intellij/usages/impl/UsageViewTreeCellRenderer.java
	platform/util-rt/src/com/intellij/execution/rmi/RemoteServer.java
	platform/util-rt/src/com/intellij/execution/rmi/ssl/SslSocketFactory.java
	platform/util/src/com/intellij/Patches.java
	platform/util/src/com/intellij/openapi/util/DefaultJDOMExternalizer.java
	platform/util/src/com/intellij/ui/ClickListener.java
	platform/util/src/com/intellij/util/LocalTimeCounter.java
	platform/util/src/com/intellij/util/ReflectionUtil.java
	platform/util/src/com/intellij/util/io/IOUtil.java
	platform/util/src/com/intellij/util/lang/JarLoader.java
	platform/util/src/com/intellij/util/text/DateFormatUtil.java
	platform/util/src/com/intellij/util/ui/UIUtil.java
	platform/util/testSrc/com/intellij/openapi/util/io/FileUtilLightTest.java
	platform/util/testSrc/com/intellij/util/FoundationTest.java
	platform/util/testSrc/com/intellij/util/text/DateFormatUtilTest.java
	platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
	platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
	platform/vcs-impl/testSrc/com/intellij/openapi/vcs/Executor.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsFullCommitDetails.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBranchFilter.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogDetailsFilter.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogFilterCollection.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogObjectsFactory.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java
	platform/vcs-log/api/src/com/intellij/vcs/log/VcsShortCommitDetails.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graph/elements/Node.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graph/mutable/GraphBuilder.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graphmodel/GraphModel.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graphmodel/fragment/ShortFragmentGenerator.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graphmodel/impl/BranchVisibleNodes.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/graphmodel/impl/GraphModelImpl.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/printmodel/impl/GraphElementsVisibilityController.java
	platform/vcs-log/graph/src/com/intellij/vcs/log/printmodel/impl/PrePrintCellModel.java
	platform/vcs-log/graph/test/com/intellij/vcs/log/graph/GraphTestUtils.java
	platform/vcs-log/graph/test/com/intellij/vcs/log/graph/mutable/GraphBuilderTest.java
	platform/vcs-log/graph/test/com/intellij/vcs/log/graphmodel/fragment/GraphModelTest.java
	platform/vcs-log/graph/test/com/intellij/vcs/log/graphmodel/fragment/ShortFragmentTest.java
	platform/vcs-log/graph/test/com/intellij/vcs/log/printmodel/cells/builder/LayoutModelBuilderTest.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataGetter.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogBranchFilterImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDataHolder.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogDateFilterImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFilterer.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogHashMap.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogJoiner.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogStructureFilterImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogUiProperties.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsFullCommitDetailsImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogFilterCollectionImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogManager.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogObjectsFactoryImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsShortCommitDetailsImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogQuickSettingsActions.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/FilterPopupComponent.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/UserFilterPopupComponent.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogFilterUi.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogTextFilterImpl.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/AbstractPaddingCellRender.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/CommitCellRender.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRender.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/RefPainter.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/AbstractVcsLogTableModel.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/GraphTableModel.java
	platform/vcs-log/impl/src/com/intellij/vcs/log/ui/tables/NoGraphTableModel.java
	platform/vcs-log/impl/test/com/intellij/vcs/log/SimpleTimedVcsCommit.java
	platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerUtil.java
	platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XLineBreakpointType.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XSourcePositionImpl.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerEvaluateActionHandler.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XEvaluateInConsoleFromEditorActionHandler.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XToggleLineBreakpointActionHandler.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointState.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointManagerImpl.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointImpl.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XLineBreakpointManager.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultConditionComboBoxPanel.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultLogExpressionComboBoxPanel.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.form
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointItemsTreeController.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueLookupManager.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/ExecutionPointHighlighter.java
	platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/TextViewer.java
	plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ByteCodeViewerComponent.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/MagicNumberInspectionBase.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspection.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dataflow/NegativelyNamedBooleanVariableInspectionBase.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringConcatenationInspectionBase.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/maturity/ThrowablePrintStackTraceInspectionBase.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CollectionUtils.java
	plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ExpectedTypeUtils.java
	plugins/InspectionGadgets/src/inspectionDescriptions/DriverManagerGetConnection.html
	plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/magic_number/MagicNumber.java
	plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/magic_number/expected.xml
	plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/mismatched_array_read_write/MismatchedArrayReadWrite.java
	plugins/InspectionGadgets/test/com/siyeh/igtest/jdk/auto_unboxing/AutoUnboxing.java
	plugins/InspectionGadgets/test/com/siyeh/igtest/jdk/auto_unboxing/expected.xml
	plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/PointlessArithmeticExpression.java
	plugins/InspectionGadgets/test/com/siyeh/igtest/numeric/pointless_arithmetic_expression/expected.xml
	plugins/InspectionGadgets/testsrc/com/siyeh/ig/abstraction/MagicNumberInspectionTest.java
	plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/InterfaceMayBeAnnotatedFunctionalInspectionTest.java
	plugins/InspectionGadgets/testsrc/com/siyeh/ig/dataflow/NegativelyNamedBooleanVariableInspectionTest.java
	plugins/IntelliLang/src/META-INF/plugin.xml
	plugins/IntentionPowerPak/src/com/siyeh/ipp/exceptions/SplitMultiCatchIntention.java
	plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java
	plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java
	plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
	plugins/devkit/devkit.iml
	plugins/devkit/src/dom/Extensions.java
	plugins/devkit/src/inspections/internal/UndesirableClassUsageInspection.java
	plugins/devkit/src/references/extensions/ExtensionPointQuickDocProvider.java
	plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
	plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java
	plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java
	plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentDetector.java
	plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
	plugins/git4idea/src/git4idea/GitCommit.java
	plugins/git4idea/src/git4idea/GitVcs.java
	plugins/git4idea/src/git4idea/checkout/GitCloneDialog.java
	plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java
	plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
	plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
	plugins/git4idea/src/git4idea/history/wholeTree/SelectRevisionInGitLogAction.java
	plugins/git4idea/src/git4idea/log/GitLogProvider.java
	plugins/git4idea/src/git4idea/repo/GitRepositoryReader.java
	plugins/git4idea/src/git4idea/roots/GitIntegrationEnabler.java
	plugins/git4idea/src/git4idea/ui/branch/GitBranchWidget.java
	plugins/git4idea/tests/git4idea/log/RefParserTest.java
	plugins/github/src/org/jetbrains/plugins/github/api/GithubApiUtil.java
	plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepositoryEditor.java
	plugins/gradle/gradle.iml
	plugins/gradle/src/META-INF/plugin.xml
	plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleScriptType.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleBuildClasspathManager.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/AbstractProjectImportErrorHandler.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleExecutionHelper.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/wizard/GradleModuleBuilder.java
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/task/GradleTaskManager.java
	plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/internal/InternalDependencyVersionId.java
	plugins/gradle/tooling-extension-v1.11/src/org/jetbrains/plugins/gradle/tooling/v1_11/internal/ModelDependenciesBuilderImplHelper.java
	plugins/gradle/tooling-extension-v1.12/gradle-tooling-extension-v1.12.iml
	plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/builder/ModelBuildScriptClasspathBuilderImpl.java
	plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/builder/ModelDependenciesBuilderImpl.java
	plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/internal/InternalDependencyVersionId.java
	plugins/gradle/tooling-extension-v1.12/src/org/jetbrains/plugins/gradle/tooling/v1_12/internal/ModelDependenciesBuilderImplHelper.java
	plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/internal/InternalDependencyVersionId.java
	plugins/gradle/tooling-extension-v1.9/src/org/jetbrains/plugins/gradle/tooling/v1_9/internal/ModelDependenciesBuilderImplHelper.java
	plugins/gradle/tooling-extension/src/org/jetbrains/plugins/gradle/model/GradleDependencyScope.java
	plugins/gradle/tooling-extension/src/org/jetbrains/plugins/gradle/tooling/internal/DependencyVersionId.java
	plugins/gradle/tooling-extension/src/org/jetbrains/plugins/gradle/tooling/internal/Scopes.java
	plugins/gradle/tooling-extension/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
	plugins/gradle/tooling-extension/testSources/org/jetbrains/plugins/gradle/tooling/builder/ModelDependenciesBuilderImplTest.java
	plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyBuilder.java
	plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovycOSProcessHandler.java
	plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/DependentGroovycRunner.java
	plugins/groovy/src/META-INF/plugin.xml
	plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
	plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GrReassignedLocalVarsChecker.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrListOrMapInfo.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrModifierFix.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyAccessibilityInspection.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessInspection.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/unusedDef/UnusedDefInspection.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyCodeStyleSettings.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/console/GroovyShellActionBase.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/fragments/GroovyCodeFragment.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/_GroovyLexer.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/lexer/groovy.flex
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrAnnotationUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrTupleType.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosableSignatureImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrImmediateClosureParameterImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrImmediateClosureSignatureImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceResolveUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionMembersCache.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GroovyScriptClass.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyCommonClassNames.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/processors/MethodResolverProcessor.java
	plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GroovyHighlightingTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyTest.groovy
	plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/extract/method/ExtractMethodTest.groovy
	plugins/groovy/testdata/parsing/groovy/types/default1.test
	plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
	plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
	plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
	plugins/hg4idea/src/org/zmlx/hg4idea/action/HgBranchPopupActions.java
	plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommonBranchActions.java
	plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMerge.java
	plugins/hg4idea/src/org/zmlx/hg4idea/command/HgLogCommand.java
	plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
	plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
	plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
	plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
	plugins/hg4idea/src/org/zmlx/hg4idea/repo/HgRepositoryReader.java
	plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCloneDialog.java
	plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgPushDialog.form
	plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgPushDialog.java
	plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgTagDialog.java
	plugins/hg4idea/src/org/zmlx/hg4idea/util/HgHistoryUtil.java
	plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
	plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java
	plugins/hg4idea/testSrc/hg4idea/test/history/HgLogHistoryTest.java
	plugins/hg4idea/testSrc/hg4idea/test/history/HgLogParseTest.java
	plugins/java-i18n/java-i18n.iml
	plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
	plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
	plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
	plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
	plugins/maven/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.artifacts.instructions.ArtifactRootCopyingHandlerProvider
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenWebArtifactRootCopyingHandlerProvider.java
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenArtifactResourceConfiguration.java
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenModuleResourceConfiguration.java
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceFileFilter.java
	plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java
	plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcher.java
	plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java
	plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenResourceCompilerConfigurationGenerator.java
	plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java
	plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
	plugins/maven/src/main/resources/META-INF/groovy-support.xml
	plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/MavenCompilingTestCase.java
	plugins/maven/src/test/java/org/jetbrains/idea/maven/compiler/ResourceFilteringTest.java
	plugins/maven/src/test/java/org/jetbrains/idea/maven/execution/MavenJUnitPatcherTest.java
	plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/GroovyImporterTest.java
	plugins/properties/properties-psi-api/properties-psi-api.iml
	plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesFileType.java
	plugins/properties/properties-psi-impl/properties-psi-impl.iml
	plugins/properties/properties-psi-impl/src/com/intellij/properties/PropertiesCoreEnvironment.java
	plugins/properties/src/com/intellij/lang/properties/PropertyManipulator.java
	plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
	plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleUtil.java
	plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleGrouper.java
	plugins/properties/src/com/intellij/lang/properties/psi/impl/PropertyImplEscaper.java
	plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesFile.java
	plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIconProvider.java
	plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurationState.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaSvnkitBasedAuthenticationCallback.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandExecutor.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/CommandRuntime.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnCommandLineInfoClient.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/TerminalProcessHandler.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/content/CmdContentClient.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnInteractiveAuthenticationProvider.java
	plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
	plugins/tasks/tasks-api/src/com/intellij/tasks/TaskRepository.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRemoteApi.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepository.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraRepositoryEditor.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/JiraTask.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestApi.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/JiraRestTask.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api2/JiraRestApi2.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/rest/api20alpha1/JiraRestApi20Alpha1.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapApi.java
	plugins/tasks/tasks-core/jira/src/com/intellij/tasks/jira/soap/JiraSoapTask.java
	plugins/tasks/tasks-core/src/META-INF/plugin.xml
	plugins/tasks/tasks-core/src/com/intellij/tasks/actions/ShowCertificateInfoAction.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/GitlabRepository.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/GitlabRepositoryEditor.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/GitlabTask.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/gitlab/model/GitlabProject.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskManagerImpl.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/mantis/MantisRepositoryEditor.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/redmine/RedmineRepository.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepository.java
	plugins/tasks/tasks-core/src/com/intellij/tasks/trello/TrelloRepositoryEditor.java
	plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/JiraIntegrationTest.java
	plugins/terminal/lib/jediterm-pty-1.0.jar
	plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalPanel.java
	plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java
	plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
	plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java
	plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java
	python/helpers/generator3.py
	python/helpers/pycharm_generator_utils/util_methods.py
	python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
	python/ide/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
	python/ide/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
	python/ide/src/com/jetbrains/python/newProject/PythonNewDirectoryProjectAction.java
	python/pluginResources/META-INF/plugin.xml
	python/psi-api/src/com/jetbrains/python/psi/LanguageLevel.java
	python/resources/liveTemplates/Python.xml
	python/resources/pycharm_core_logo.png
	python/resources/pycharm_core_logo@2x.png
	python/resources/tips/RemoteInterpreter.html
	python/rest/resources/META-INF/plugin.xml
	python/src/META-INF/IdeTipsAndTricks.xml
	python/src/META-INF/python-core.xml
	python/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java
	python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
	python/src/com/jetbrains/python/console/PydevConsoleRunner.java
	python/src/com/jetbrains/python/console/PythonConsoleView.java
	python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
	python/src/com/jetbrains/python/inspections/PyArgumentListInspection.java
	python/src/com/jetbrains/python/inspections/PyAssignmentToLoopOrWithParameterInspection.java
	python/src/com/jetbrains/python/inspections/PyInitNewSignatureInspection.java
	python/src/com/jetbrains/python/inspections/PyPep8NamingInspection.java
	python/src/com/jetbrains/python/inspections/PyProtectedMemberInspection.java
	python/src/com/jetbrains/python/inspections/PyStatementEffectInspection.java
	python/src/com/jetbrains/python/inspections/PyStringFormatInspection.java
	python/src/com/jetbrains/python/inspections/PyStringFormatParser.java
	python/src/com/jetbrains/python/inspections/PyUnresolvedReferencesInspection.java
	python/src/com/jetbrains/python/inspections/quickfix/AddFieldQuickFix.java
	python/src/com/jetbrains/python/inspections/quickfix/AddFunctionQuickFix.java
	python/src/com/jetbrains/python/inspections/quickfix/AddMethodQuickFix.java
	python/src/com/jetbrains/python/inspections/quickfix/GenerateBinaryStubsFix.java
	python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
	python/src/com/jetbrains/python/projectView/PyTreeStructureProvider.java
	python/src/com/jetbrains/python/psi/PyUtil.java
	python/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
	python/src/com/jetbrains/python/psi/stubs/PyModuleNameIndex.java
	python/src/com/jetbrains/python/remote/PyRemoteSdkAdditionalDataBase.java
	python/src/com/jetbrains/python/remote/PythonRemoteInterpreterManager.java
	python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java
	python/src/com/jetbrains/python/sdk/CreateVirtualEnvDialog.java
	python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
	python/src/com/jetbrains/python/sdk/PythonSdkType.java
	python/src/com/jetbrains/python/sdk/skeletons/PySkeletonRefresher.java
	python/testData/inspections/PyAssignmentToLoopOrWithParameterInspection/bad.py
	python/testData/inspections/PyAssignmentToLoopOrWithParameterInspection/good.py
	python/testSrc/com/jetbrains/python/inspections/PyAttributeOutsideInitInspectionTest.java
	python/testSrc/com/jetbrains/python/inspections/PyPep8NamingInspectionTest.java
	resources-en/src/messages/DebuggerBundle.properties
	resources-en/src/tips/AltInsertInEditor.html
	resources/src/META-INF/IdeTipsAndTricks.xml
	resources/src/META-INF/IdeaPlugin.xml
	resources/src/META-INF/PostfixTemplates.xml
	updater/src/com/intellij/updater/Digester.java
	updater/src/com/intellij/updater/Runner.java
	updater/src/com/intellij/updater/SwingUpdaterUI.java
	updater/src/com/intellij/updater/Utils.java
	xml/dom-impl/src/com/intellij/util/xml/impl/StaticGenericInfoBuilder.java
	xml/dom-impl/src/com/intellij/util/xml/impl/VisitorDescription.java
	xml/dom-openapi/src/com/intellij/util/xml/ElementPresentationManager.java
	xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java
	xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java
	xml/impl/src/com/intellij/codeInsight/editorActions/XmlGtTypedHandler.java
	xml/impl/src/com/intellij/codeInsight/template/emmet/SurroundWithEmmetAction.java
	xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
	xml/impl/src/com/intellij/codeInsight/template/emmet/completion/EmmetAbbreviationCompletionProvider.java
	xml/impl/src/com/intellij/codeInsight/template/emmet/completion/XmlEmmetAbbreviationCompletionProvider.java
	xml/impl/src/com/intellij/html/impl/Html5CustomAttributeDescriptorsProvider.java
	xml/impl/src/com/intellij/ide/browsers/BrowserLauncherImpl.java
	xml/impl/src/com/intellij/ide/browsers/BrowserSettingsPanel.java
	xml/impl/src/com/intellij/ide/browsers/ConfigurableWebBrowser.java
	xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java
	xml/impl/src/com/intellij/ide/browsers/StartBrowserPanel.java
	xml/impl/src/com/intellij/ide/browsers/actions/BaseOpenInBrowserAction.java
	xml/impl/src/com/intellij/ide/browsers/impl/DefaultUrlOpener.java
	xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java
	xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java
	xml/xml-psi-impl/src/com/intellij/ide/highlighter/XmlLikeFileType.java
	xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
	xml/xml-psi-impl/src/com/intellij/xml/util/HTMLControls.java
	xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java

Change-Id: Ia25fea399e65dc424a41be93524004c4c5ee317c

7 files changed, 42 insertions, 5 deletions

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8bf4a1ab18b0..3407e7c49c03 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -44,6 +44,7 @@
       <module name="remote-servers-agent-rt" target="1.5" />
       <module name="testng_rt" target="1.5" />
       <module name="ui-designer-jps-plugin" target="1.6" />
+      <module name="util-rt" target="1.5" />
     </bytecodeTargetLevel>
   </component>
   <component name="EclipseCompilerSettings">
diff --git a/.idea/libraries/Eclipse.xml b/.idea/libraries/Eclipse.xml
index ebbdcf8a9bcd..0e496f809fd9 100644
--- a/.idea/libraries/Eclipse.xml
+++ b/.idea/libraries/Eclipse.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Eclipse">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/ecj-4.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/ecj-4.3.2.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/ecjsrc-4.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/ecjsrc-4.3.2.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Snappy_Java.xml b/.idea/libraries/Snappy_Java.xml
index f00f00cf6c65..5074887332c1 100644
--- a/.idea/libraries/Snappy_Java.xml
+++ b/.idea/libraries/Snappy_Java.xml
@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Snappy-Java">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/snappy-java-1.0.5.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/snappy-in-java-0.3.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/snappy-java-1.0.5.zip!/snappy-java-1.0.5/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/snappy-in-java-0.3-src.jar!/snappy-snappy-0.3/src/main/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/asm5.xml b/.idea/libraries/asm5.xml
new file mode 100644
index 000000000000..e4873676bb75
--- /dev/null
+++ b/.idea/libraries/asm5.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="asm5">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/asm-all.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/asm5-src.zip!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/jsch_agent_proxy.xml b/.idea/libraries/jsch_agent_proxy.xml
new file mode 100644
index 000000000000..f93e3e59f6db
--- /dev/null
+++ b/.idea/libraries/jsch_agent_proxy.xml
@@ -0,0 +1,21 @@
+<component name="libraryTable">
+  <library name="jsch-agent-proxy">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.usocket-nc.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.usocket-jna.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.sshagent.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.pageant.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch.agentproxy.connector-factory.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-pageant/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-sshagent/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-usocket-nc/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-usocket-jna/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jsch-agent-proxy.zip!/jsch-agent-proxy-0.0.6/jsch-agent-proxy-connector-factory/src/main/java" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3da23322cd48..02af1e2c6d07 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -114,6 +114,7 @@
       <module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-impl.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-model-serialization.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml" filepath="$PROJECT_DIR$/jps/model-impl/jps-model-tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jps/plugin-system/jps-plugin-system.iml" filepath="$PROJECT_DIR$/jps/plugin-system/jps-plugin-system.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" filepath="$PROJECT_DIR$/jps/model-serialization/jps-serialization-tests.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" filepath="$PROJECT_DIR$/jps/standalone-builder/jps-standalone-builder.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" filepath="$PROJECT_DIR$/java/jsp-base-openapi/jsp-base-openapi.iml" group="java" />
@@ -154,6 +155,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/properties/properties.iml" filepath="$PROJECT_DIR$/plugins/properties/properties.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/properties/properties-psi-api/properties-psi-api.iml" filepath="$PROJECT_DIR$/plugins/properties/properties-psi-api/properties-psi-api.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/properties/properties-psi-impl/properties-psi-impl.iml" filepath="$PROJECT_DIR$/plugins/properties/properties-psi-impl/properties-psi-impl.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/protocol/protocol-reader-runtime/protocol-reader-runtime.iml" filepath="$PROJECT_DIR$/platform/script-debugger/protocol/protocol-reader-runtime/protocol-reader-runtime.iml" group="platform/script-debugger" />
       <module fileurl="file://$PROJECT_DIR$/python/python-community.iml" filepath="$PROJECT_DIR$/python/python-community.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/build/python-community-build.iml" filepath="$PROJECT_DIR$/python/build/python-community-build.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" filepath="$PROJECT_DIR$/python/pluginSrc/python-community-plugin.iml" group="python" />
@@ -175,6 +177,8 @@
       <module fileurl="file://$PROJECT_DIR$/resources/resources.iml" filepath="$PROJECT_DIR$/resources/resources.iml" />
       <module fileurl="file://$PROJECT_DIR$/resources-en/resources-en.iml" filepath="$PROJECT_DIR$/resources-en/resources-en.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/rest/rest.iml" filepath="$PROJECT_DIR$/python/rest/rest.iml" group="python" />
+      <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" filepath="$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" group="platform/script-debugger" />
+      <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" filepath="$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" group="platform/script-debugger" />
       <module fileurl="file://$PROJECT_DIR$/../base/sdk-common/sdk-common.iml" filepath="$PROJECT_DIR$/../base/sdk-common/sdk-common.iml" group="plugins/Android/android-sdk" />
       <module fileurl="file://$PROJECT_DIR$/../base/sdklib/sdklib.iml" filepath="$PROJECT_DIR$/../base/sdklib/sdklib.iml" group="plugins/Android/android-sdk" />
       <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" />
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
index ec8ce0516fae..9daa6f5886c4 100644
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -83,7 +83,7 @@
       <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
       </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+      <item class="com.intellij.ui.components.JBTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
           <preferred-size width="200" height="200" />
         </default-constraints>