Roman Donchenko 3f8db9d708 Merge pull request #1450 from adrians:neon-pull3

2013-10-14 15:08:37 +04:00

..

doc

Merge branch 'master' into gpu-cuda-rename

2013-09-09 12:57:35 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

perf

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

2013-09-02 19:44:51 +04:00

src

Merge pull request #1450 from adrians:neon-pull3

2013-10-14 15:08:37 +04:00

test

Merge branch 'master' into gpu-cuda-rename

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

CMakeLists.txt

Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.

2013-08-22 18:17:19 +04:00