sprice 1c15776cf5 Merge branch 'master' of https://github.com/Itseez/opencv ... Conflicts: modules/imgproc/src/sumpixels.cpp		2013-12-11 14:35:51 -08:00
..
doc	added cv::intergal to T-API	2013-12-06 13:18:25 +04:00
include/opencv2	added cv::blendLinear	2013-12-10 13:07:52 +04:00
perf	hopefully, the last test failures are fixed now	2013-10-24 23:31:00 +04:00
src	Merge branch 'master' of https://github.com/Itseez/opencv	2013-12-11 14:35:51 -08:00
test	Merge pull request #1970 from ilya-lavrenov:tapi_checks	2013-12-11 21:37:10 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00