From: Anton Makeev Date: Fri, 21 Oct 2016 16:15:40 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs-master X-Git-Tag: clion/171.339~3^2~3 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=55e3c094448a6703e4ebfab9588fcd15088f1b85 Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs-master --- 55e3c094448a6703e4ebfab9588fcd15088f1b85