Andrey Pavlenko 330e4bb48a Merge pull request #6734 from PkLab:doc_videoio_enums

2016-07-01 13:24:05 +00:00

..

include/opencv2

Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums

2016-06-28 16:40:30 +02:00

misc/java/test

Updated Manager for Android

2015-06-02 17:33:04 +03:00

perf

Split highgui module to videoio and highgui

2014-07-14 23:16:47 +04:00

src

Merge pull request #6558 from lletourn:master

2016-06-30 13:44:16 +00:00

test

Merge 2.4 into master

2015-12-08 10:24:54 +03:00

CMakeLists.txt

- removed whitespaces

2016-01-25 13:13:13 +01:00