Merge remote-tracking branch 'origin/master' into mark_folder_as
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 13 Nov 2015 16:17:33 +0000 (17:17 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 13 Nov 2015 16:17:33 +0000 (17:17 +0100)
commit16dd51600d7fb1bc90e01434fc42d8d272ca4755
treee821180aa1076ed6137995a6192be9c90761f629
parente0cd40a509b9c21209e12bc4927c5ef5a4888484
parent8614035e21ee5d96bd775e46c7cbbcc3eedb58f2
Merge remote-tracking branch 'origin/master' into mark_folder_as
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java