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 branch 'master' into merge-2.4

2013-08-16 14:14:12 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-06-25 15:55:52 +04:00

perf

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

src

removed tab in five-point.cpp

2013-07-18 10:09:50 +08:00

test

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00