projects / idea / community.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47cef86 e65be7e)
Merge branches 'evagl/OC-11226' and 'master' of git.labs.intellij.net:idea/community
authorAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Wed, 15 Jun 2016 15:44:54 +0000 (18:44 +0300)
committerAleksandr Samofalov <aleksandr.samofalov@jetbrains.com>
Wed, 15 Jun 2016 15:44:54 +0000 (18:44 +0300)

Trivial merge
IntelliJ IDEA Community Edition and IntelliJ Platform.