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)
commit012689830bd1b4854913910b658d4eca2f5c582f
tree36f5669fdbc14c4e6842b526d9271930e950e537
parent94c16d9b6ae393e360ab49981179d4ae918d7be9
parente8c0586d822345f43ca1a6a839d8e370cfc004cc
Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml
platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java