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-07-03 19:53:21 +04:00

perf

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

2013-07-03 19:53:21 +04:00

src

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

2013-08-13 12:56:39 +04:00

test

Merge pull request #1068 from AoD314:webp2

2013-07-15 11:45:28 +04:00

CMakeLists.txt

Removed CMake version checks that we don't need anymore.

2013-08-08 12:03:41 +04:00