projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3926675 59a91fd)
Merge branch 'konstantin.ulitin/multiple-stub-roots'
authorKonstantin Ulitin <konstantin.ulitin@jetbrains.com>
Wed, 15 Jul 2015 11:24:56 +0000 (14:24 +0300)
committerKonstantin Ulitin <konstantin.ulitin@jetbrains.com>
Wed, 15 Jul 2015 11:24:56 +0000 (14:24 +0300)
Conflicts:
platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java


Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.