Roman Donchenko 30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4 ...

Conflicts:
	doc/tutorials/bioinspired/retina_model/retina_model.rst~

2013-10-02 13:37:33 +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 remote-tracking branch 'origin/master' into merge-2.4

2013-10-02 13:37:33 +04:00

test

Docs updated, added InputArray, fixes for makePtr,...

2013-09-26 19:02:35 +04:00

CMakeLists.txt

Mergin itseez

2013-09-18 18:55:12 +04:00