Roman Donchenko 4d06c4c7b6 Merge commit '43aec5ad^' into merge-2.4 ... Conflicts: modules/contrib/src/inputoutput.cpp modules/gpu/perf/perf_imgproc.cpp modules/gpuarithm/perf/perf_element_operations.cpp modules/gpuarithm/src/element_operations.cpp modules/ts/src/precomp.hpp		2013-08-27 13:23:26 +04:00
..
doc	updated documentation	2013-06-17 09:53:39 +04:00
include/opencv2	removed obsolete API from gpuarithm module	2013-07-12 08:40:30 +04:00
perf	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
src	Merge commit '43aec5ad^' into merge-2.4	2013-08-27 13:23:26 +04:00
test	added cvconfig.hpp header file to gpu tests	2013-08-19 12:46:57 +04:00
CMakeLists.txt	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00