Merge branch 'master' into daywalker/cmake_editing
authorVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 27 Apr 2016 12:56:35 +0000 (15:56 +0300)
committerVasily Pisar <vasily.pisar@jetbrains.com>
Wed, 27 Apr 2016 12:56:35 +0000 (15:56 +0300)
commitb8b78814a56af4ec5ade0c5819fb99e85eaa6a08
treecc99da17b6d7aa1a9f5cc6abc72898e175908c32
parente04a0771cbd3d578420ad1faee47ca7b7cfdedf1
parent4409491323f017f8f5d48e639b7675a69f330519
Merge branch 'master' into daywalker/cmake_editing