projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
367d370
b7c079b
)
Merge remote-tracking branch 'origin/master' into develar/is
author
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Tue, 12 Jul 2016 14:04:34 +0000
(16:04 +0200)
committer
Vladimir Krivosheev
<vladimir.krivosheev@jetbrains.com>
Tue, 12 Jul 2016 14:04:34 +0000
(16:04 +0200)
# Conflicts:
# platform/configuration-store-impl/src/StateStorageManagerImpl.kt
1
2
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
patch
|
diff1
|
diff2
|
blob
|
history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/util/resources/misc/registry.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
Simple merge
diff --cc
platform/configuration-store-impl/src/StateStorageManagerImpl.kt
Simple merge
diff --cc
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNodeInfo.java
Simple merge
diff --cc
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
Simple merge
diff --cc
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java
Simple merge
diff --cc
platform/util/resources/misc/registry.properties
Simple merge