Roman Donchenko 2530b580a8 Merge branch 'master' into merge-2.4 ... Conflicts: modules/photo/doc/inpainting.rst		2013-08-16 14:14:12 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-08-13 12:56:39 +04:00
include/opencv2	added handling of camera parameters estimation errors (#3122)	2013-07-03 15:20:14 +04:00
perf	Make core/internal.hpp a private header	2013-04-01 17:29:10 +04:00
src	defined uint for non-windows platforms too. replaced isnan for cvIsNaN.	2013-08-14 17:16:52 +02:00
test	Main module headers are moved 1 level up	2013-03-13 17:26:56 +04:00
CMakeLists.txt	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00