Merge pull request #8044 from alalek:opencv_world_with_contrib
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 12:54:15 +0000 (12:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Jan 2017 12:54:16 +0000 (12:54 +0000)
commit9e9fd281b913d3834cd2386cd89e1422824db25e
tree1eb94050d4882fd1cfa3c4fd9940788bdb2d79d0
parent5c13ffb73edef4d105fbafc1bff0bff3560eedb2
parent4b7c0b9c76cf201172ab66cf77f9cdbf6fb9c586
Merge pull request #8044 from alalek:opencv_world_with_contrib