Merge pull request #3971 from Dikay900:2_4_to_master_3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 17 May 2015 00:28:30 +0000 (00:28 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 17 May 2015 00:28:30 +0000 (00:28 +0000)
1  2 
modules/objdetect/src/hog.cpp

Simple merge