Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 28 Apr 2015 11:00:57 +0000 (11:00 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 28 Apr 2015 11:00:57 +0000 (11:00 +0000)
commite60dcc9b3be0fdbee6625cbb87c73b4fd770b4a9
treeb0e0eadf734232664d48a393dd78ccaf9d8b6214
parent72458034057f4fdcdf55ffcde56c8a21b23de9b3
parent63dbeeaac535fddf0924384cb4f9eca59f17bd66
Merge pull request #3966 from Dikay900:master_diff_to_2_4_2
cmake/OpenCVCompilerOptions.cmake