Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 8 Jun 2016 15:54:04 +0000 (18:54 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 8 Jun 2016 15:54:04 +0000 (18:54 +0300)
commite6f4a42d89946c8bfa2af52003fc59b0ac0535b2
tree5135184391d3a84b119e5931df267b588e7178f5
parent8fd1a1fd2e1f3bf907801f6d924528d107865e24
parente2748a5f157e6df9897c95d2cfd1509e32582094
Merge branch 'master' into vasily_pisar/cmake_console