projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 613179f 24e603f)
Merge remote-tracking branch 'origin/master' into amakeev/cmake-iml
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 19 Aug 2016 18:23:45 +0000 (20:23 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 19 Aug 2016 18:23:45 +0000 (20:23 +0200)
# Conflicts:
# platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java

1  2 
platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java patch | diff1 | diff2 | blob | history

IntelliJ IDEA Community Edition and IntelliJ Platform.