Andrey Pavlenko 6bfbcf02cb Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate		2014-04-11 12:47:25 +04:00
..
doc	Change Canny input image description, we can use multichannel image now	2014-04-07 14:26:48 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-11 17:20:01 +04:00
perf	Change sanity check for perfomance test of bilateral filter	2014-04-07 14:26:47 +04:00
src	Merge pull request #2587 from ElenaGvozdeva:ipp_matchTemplate	2014-04-11 12:47:25 +04:00
test	Merge pull request #2586 from ilya-lavrenov:ipp_disable	2014-04-09 14:16:25 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00