projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6371910 62c012c)
Merge branch 'master' into upsource-master
authorEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Tue, 3 Jul 2012 16:20:07 +0000 (18:20 +0200)
committerEvgeny Pasynkov <Evgeny.Pasynkov@jetbrains.com>
Tue, 3 Jul 2012 16:20:07 +0000 (18:20 +0200)
commit2a3869d8437c8401415fb7d2aabf2c128e22238c
tree8170ad8733d2b031ee108eee6f7cd008a9bed493tree
parent6371910dbac3aef1d8173af657d7239fe48449f5commit | diff
parent62c012c05c8d998170989fe8a082eac36a27f9fecommit | diff
Merge branch 'master' into upsource-master
95 files changed:
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java diff1 | diff2 | blob | history
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java diff1 | diff2 | blob | history
java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java diff1 | diff2 | blob | history
java/java-impl/src/com/intellij/psi/util/CreateClassUtil.java diff1 | diff2 | blob | history
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java diff1 | diff2 | blob | history
java/java-psi-api/src/com/intellij/psi/util/InheritanceUtil.java diff1 | diff2 | blob | history
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLiteralExpressionImpl.java diff1 | diff2 | blob | history
java/java-tests/testData/codeInsight/completion/keywords/returnInTernary.java | diff2 | blob | history
java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/javac/JavacFileManager.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java diff1 | diff2 | blob | history
jps/jps-builders/src/org/jetbrains/jps/javac/OutputFileObject.java diff1 | diff2 | blob | history
platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java diff1 | diff2 | blob | history
platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java diff1 | diff2 | blob | history
platform/lang-api/src/com/intellij/patterns/PsiElementPattern.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInsight/daemon/quickFix/FileReferenceQuickFixProvider.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateAction.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateManager.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplateDialog.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageManagerImpl.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/tools/ToolAction.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/tools/ToolBeforeRunTask.java | diff2 | blob | history
platform/lang-impl/src/com/intellij/tools/ToolBeforeRunTaskProvider.java | diff2 | blob | history
platform/lang-impl/src/com/intellij/tools/ToolSelectDialog.java | diff2 | blob | history
platform/lang-impl/src/com/intellij/tools/ToolsPanel.java diff1 | diff2 | blob | history
platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java diff1 | diff2 | blob | history
platform/platform-api/src/com/intellij/openapi/ui/Messages.java diff1 | diff2 | blob | history
platform/platform-api/src/com/intellij/util/Icons.java | diff2 | blob | history
platform/platform-impl/src/com/intellij/ide/ReopenProjectAction.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomActionsSchema.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceManager.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapAwareDocumentParsingListenerAdapter.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java diff1 | diff2 | blob | history
platform/platform-resources-en/src/messages/ToolsBundle.properties diff1 | diff2 | blob | history
platform/platform-resources/src/META-INF/LangExtensions.xml diff1 | diff2 | blob | history
platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/softwrap/mapping/SoftWrapApplianceOnDocumentModificationTest.java diff1 | diff2 | blob | history
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java diff1 | diff2 | blob | history
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/DirectoryInfo.java diff1 | diff2 | blob | history
platform/util-rt/src/com/intellij/openapi/util/Comparing.java diff1 | diff2 | blob | history
platform/util/src/com/intellij/execution/process/UnixProcessManager.java diff1 | diff2 | blob | history
platform/util/src/com/intellij/openapi/util/text/StringUtil.java diff1 | diff2 | blob | history
platform/util/src/com/intellij/util/containers/ConcurrentHashMap.java diff1 | diff2 | blob | history
platform/util/src/com/intellij/util/text/StringSearcher.java diff1 | diff2 | blob | history
platform/vcs-impl/src/com/intellij/openapi/vcs/update/CommonIntegrateFileOrDirectoryAction.java diff1 | diff2 | blob | history
platform/vcs-impl/src/com/intellij/openapi/vcs/update/CommonUpdateFileOrDirectoryAction.java diff1 | diff2 | blob | history
plugins/android-designer/src/com/intellij/android/designer/AndroidDesignerBundle.java diff1 | diff2 | blob | history
plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java diff1 | diff2 | blob | history
plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceDialog.java diff1 | diff2 | blob | history
plugins/android/src/org/jetbrains/android/AndroidFileTemplateProvider.java diff1 | diff2 | blob | history
plugins/android/src/org/jetbrains/android/newProject/AndroidModuleBuilder.java diff1 | diff2 | blob | history
plugins/git4idea/src/git4idea/config/GitVcsSettings.java diff1 | diff2 | blob | history
plugins/github/src/org/jetbrains/plugins/github/GithubCreateGistAction.java diff1 | diff2 | blob | history
plugins/github/src/org/jetbrains/plugins/github/GithubSettings.java diff1 | diff2 | blob | history
plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java diff1 | diff2 | blob | history
plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java diff1 | diff2 | blob | history
plugins/groovy/src/META-INF/plugin.xml diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/actions/GroovyTemplatesFactory.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrHighlightUtil.java | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrKeywordAndDeclarationHighlightFactory.java | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrKeywordAndDeclarationHighlighter.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighter.java | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighterFactory.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignabilityCheckInspection.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUnresolvedAccessInspection.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GroovyUntypedAccessInspection.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrHighlightExitPointHandler.java | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GrHighlightHandlerFactory.java diff1 | diff2 | blob | history
plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/AddReturnTypeFix.java diff1 | diff2 | blob | history
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy diff1 | diff2 | blob | history
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java diff1 | diff2 | blob | history
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenBaseModifiableModelsProvider.java diff1 | diff2 | blob | history
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenUtil.java diff1 | diff2 | blob | history
plugins/properties/src/com/intellij/lang/properties/PropertiesDocumentationProvider.java diff1 | diff2 | blob | history
plugins/tasks/tasks-core/src/com/intellij/tasks/github/GitHubRepository.java diff1 | diff2 | blob | history
plugins/tasks/tasks-core/src/com/intellij/tasks/github/GithubApiUtil.java | diff2 | blob | history
plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskUtil.java diff1 | diff2 | blob | history
plugins/tasks/tasks-core/src/com/intellij/tasks/pivotal/PivotalTrackerRepository.java diff1 | diff2 | blob | history
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerBundle.java diff1 | diff2 | blob | history
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/WrapInAction.java diff1 | diff2 | blob | history
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java diff1 | diff2 | blob | history
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java diff1 | diff2 | blob | history
resources-en/src/fileTemplates/default.html diff1 | diff2 | blob | history
resources-en/src/fileTemplates/includes/File Header.java.html diff1 | diff2 | blob | history
resources-en/src/fileTemplates/includes/default.html diff1 | diff2 | blob | history
resources-en/src/fileTemplates/internal/Class.java.html diff1 | diff2 | blob | history
resources-en/src/fileTemplates/internal/Interface.java.html diff1 | diff2 | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.