Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml clion/163.4669
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 16 Sep 2016 13:05:39 +0000 (15:05 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 16 Sep 2016 13:05:39 +0000 (15:05 +0200)
1  2 
platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java