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	Removed CV_EXPORTS from all template classes (that I could find).	2013-07-25 19:40:08 +04:00
perf	Merge branch '2.4'	2013-04-17 12:07:17 +04:00
src	Merge pull request #1110 from SpecLad:config-cleanup	2013-07-30 17:39:35 +04:00
test	Move border type constants and Moments class to core module	2013-04-10 19:14:24 +04:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00