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

Merge pull request #1253 from kamjagin:fixingCompilationOnOSX

2013-08-15 11:54:55 +04:00

perf

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

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

src

Merge branch 'master' into merge-2.4

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

test

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

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

CMakeLists.txt

Merge pull request #1162 from jet47:cudev-integration

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