projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b548de3 72a6f2d)
Merge remote-tracking branch 'origin/master' into develar/is
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 12:30:49 +0000 (14:30 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Thu, 7 Jul 2016 12:30:49 +0000 (14:30 +0200)
commit91c2d0050756f0f92cb7c1197dbb9fe56d76b6a4
treed8c2aeaf36ad93629483fd1d24d5676697e70878tree
parentb548de324767d79ce412aac7a7b8ee715f5a661ccommit | diff
parent72a6f2d7d6c0cab4cb292894bd3c0210d8244b73commit | diff
Merge remote-tracking branch 'origin/master' into develar/is

# Conflicts:
# platform/configuration-store-impl/src/StateStorageManagerImpl.kt
# platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
17 files changed:
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java diff1 | diff2 | blob | history
java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java diff1 | diff2 | blob | history
json/src/com/jetbrains/jsonSchema/JsonSchemaFileTypeManager.java diff1 | diff2 | blob | history
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java diff1 | diff2 | blob | history
platform/configuration-store-impl/src/StateMap.kt diff1 | diff2 | blob | history
platform/configuration-store-impl/src/StateStorageManagerImpl.kt diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java diff1 | diff2 | blob | history
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/header/InspectionToolsConfigurable.java diff1 | diff2 | blob | history
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java diff1 | diff2 | blob | history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml diff1 | diff2 | blob | history
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java diff1 | diff2 | blob | history
platform/util/resources/misc/registry.properties diff1 | diff2 | blob | history
xml/xml-psi-impl/src/com/intellij/xml/util/HtmlUtil.java diff1 | diff2 | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.