Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/commu... appcode/146.614
authorAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 3 Mar 2016 16:00:06 +0000 (19:00 +0300)
committerAleksandr <aleksandr.samofalov@jetbrains.com>
Thu, 3 Mar 2016 16:00:06 +0000 (19:00 +0300)
commit903ac5d3d68e4c171d2a5a601b8daae10b70489b
tree3fff0db04a92686a85353ce491054ee27b5d967e
parentaaddba721e58ddfcfaf589d41348a8186d5ef317
parent4dee50be5f451ec7f3861194d6b92f198c8e691e
Merge branches 'evagl/included-from' and 'master' of git.labs.intellij.net:idea/community into evagl/included-from