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)
commit40ea9682506b185c1e7efbce25af2c0b8da3995f
tree8bedf6f1910601cc36df0d1e4a7d2eff0646ced0
parent39266755463fe9e7f2ac4131eb357a21af7117d0
parent59a91fd7946a039c1d1281dcd4307ce483c44016
Merge branch 'konstantin.ulitin/multiple-stub-roots'

Conflicts:
platform/indexing-impl/src/com/intellij/psi/stubs/StubProcessingHelperBase.java