Merge branch 'master' into daywalker/cmake_editing clion/146.1343 clion/146.1362 clion/146.1491 clion/146.1496
authorVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 18 Apr 2016 10:07:33 +0000 (13:07 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Mon, 18 Apr 2016 10:07:33 +0000 (13:07 +0300)
commite04a0771cbd3d578420ad1faee47ca7b7cfdedf1
tree2e8e8f9912df26867c986c42484797e83f1d9d21
parent0a0bf0a1be31f694844309d4735d6aee50c1d71b
parent0d401dad0e1a91e83f6e8cd0a965e2f78f56e8aa
Merge branch 'master' into daywalker/cmake_editing