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)
1  2 
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java