Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 2 Jun 2016 11:08:25 +0000 (14:08 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Thu, 2 Jun 2016 11:08:25 +0000 (14:08 +0300)
commitfbdc6d805c493c13a2764a01602e749bd05045c6
tree4e33f1db216db22dafbb542a6a7a6d114c025d53
parent0dbb20d42b61f1d74b25767f6b43c8624a9a82fa
parentaf6fab8d464aec9396c68febe59ccc68dded0eaa
Merge branch 'master' into vasily_pisar/cmake_console