Merge pull request #6951 from kurenai:fix_macro
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 19 Jul 2016 14:05:17 +0000 (14:05 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 19 Jul 2016 14:05:17 +0000 (14:05 +0000)
commita2921fdede34fb0a586fdea59318fbeb47d03174
treef5aa06eabc9ac937f32caa1b055adbf238e19c0b
parent5d3860703d70047ee5055c6800d86cb36c03d490
parent2dec662ebf29e96499aff5ff10451889f15bbb56
Merge pull request #6951 from kurenai:fix_macro