Merge branch 'master' of https://github.com/Itseez/opencv
authorAlexandr Kondratev <theg4sh@gmail.com>
Tue, 5 Jul 2016 10:34:11 +0000 (13:34 +0300)
committerAlexandr Kondratev <theg4sh@gmail.com>
Tue, 5 Jul 2016 10:34:11 +0000 (13:34 +0300)
commitf5b96eb828da2f8c8d33f616194108ab74956643
treeb30b5c4d9e7587767402d3c97b4e13715f2b92d9
parent179998a8a2099e56ab8303f7e52ebfd11af71b1d
parent22682f933a97c23e5c8d93baed590c5224804724
Merge branch 'master' of https://github.com/Itseez/opencv