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

renamed gpu headers (made it more consistent)

2013-06-10 12:40:30 +04:00

perf

fixed gpu performance tests:

2013-07-16 15:43:04 +04:00

src

Remove HAVE_CVCONFIG_H - it's always defined.

2013-07-10 16:02:07 +04:00

test

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00

CMakeLists.txt

Revert "Revert "Merge pull request #836 from jet47:gpu-modules""

2013-06-07 13:05:39 +04:00