Vladislav Vinogradov 1ad4592bfc Merge branch 'master' into gpu-cuda-rename ... Conflicts: modules/cudaoptflow/perf/perf_optflow.cpp modules/cudaoptflow/src/tvl1flow.cpp samples/gpu/stereo_multi.cpp		2013-09-04 09:58:32 +04:00
..
doc	fixed docs	2013-09-02 14:00:44 +04:00
include/opencv2	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
src	Merge branch 'master' into gpu-cuda-rename	2013-09-04 09:58:32 +04:00
test	Merge pull request #1224 from mbarnach:pca_io	2013-09-03 18:43:54 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00