Roman Donchenko a4b3aa9e1e Merge pull request #1477 from nzjrs:python-gethardwaresupport		2013-09-30 17:44:45 +04:00
..
doc	Merge branch 'master' into gpu-cuda-rename	2013-09-09 12:57:35 +04:00
include/opencv2	Merge pull request #1477 from nzjrs:python-gethardwaresupport	2013-09-30 17:44:45 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
src	Merge pull request #1485 from vpisarev:ipp_fixes	2013-09-26 11:09:59 +04:00
test	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00