Merge pull request #5757 from alalek:merge-2.4

author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)

committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>

Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)
author Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)
committer Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc apps/traincascade/cascadeclassifier.cpp
Simple merge
author	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)
committer	Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
	Tue, 8 Dec 2015 11:51:29 +0000 (11:51 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
apps/traincascade/cascadeclassifier.cpp	patch \|	diff1 \|	diff2 \|	blob \| history