Roman Donchenko bb4bf7a1f9 Merge pull request #1811 from Nerei:fixed_some_build_errors

2013-11-18 18:09:44 +04:00

..

doc

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

include/opencv2

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

perf

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

src

Merge pull request #1811 from Nerei:fixed_some_build_errors

2013-11-18 18:09:44 +04:00

test

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

2013-11-05 16:38:23 +04:00

CMakeLists.txt

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

2013-10-15 20:08:52 +04:00