projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b0b8eab 27c5e39)
Merge branch 'IDEA-CR-10038'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 17 May 2016 09:12:11 +0000 (11:12 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 17 May 2016 09:12:11 +0000 (11:12 +0200)
commit0e6cd68aeecdd9e5302b0c674f824fb3a5f5e1e1
tree75d93f8db20ae81aac53e7c4b0d98ec0dc437d75tree
parentb0b8eab3338e9527683867a7a5f4931dce53f097commit | diff
parent27c5e39ee4689ee327d9983d00fb86a623ed6eb4commit | diff
Merge branch 'IDEA-CR-10038'

# Conflicts:
# platform/built-in-server/src/org/jetbrains/ide/OpenFileHttpService.java
# platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
# platform/util/resources/misc/registry.properties
platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java diff1 | diff2 | blob | history
platform/util/resources/misc/registry.properties diff1 | diff2 | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.