Merge branch 'master' into vasily_pisar/cmake_console
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 4 May 2016 08:25:55 +0000 (11:25 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 4 May 2016 08:25:55 +0000 (11:25 +0300)
commitcbbfb3ee22684330ad1f7206eab72452d3147fdc
treef5197d641aaffb7837ad41523533042c81a70f2f
parent0dbb20d42b61f1d74b25767f6b43c8624a9a82fa
parent0b1d9888f7ad4c28ab92e9a2618106c8476d259a
Merge branch 'master' into vasily_pisar/cmake_console