Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Fri, 10 Jun 2016 16:10:34 +0000 (19:10 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Fri, 10 Jun 2016 16:10:34 +0000 (19:10 +0300)
commit286a0c44e1bdb29bf589a246208ac11df95de8dd
tree7641294224ccae247f8c33e536baaa254cd09274
parente6f4a42d89946c8bfa2af52003fc59b0ac0535b2
parenta66707a3c79fd90da25cdbb7bc9deb1fdbcf9ed4
Merge branch 'master' into vasily_pisar/cmake_console