Vadim Pisarevsky 903f10c237 Merge pull request #3804 from polarfuchs99:master

2015-03-17 11:12:49 +00:00

..

include/opencv2

Merge remote-tracking branch 'upstream/master'

2015-03-07 13:10:41 +01:00

misc/java/test

Modified java wrapping mechanism

2015-03-02 18:12:30 +03:00

perf

Split highgui module to videoio and highgui

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

src

Merge pull request #3804 from polarfuchs99:master

2015-03-17 11:12:49 +00:00

test

Disabled videoio_video_prop_fps test

2014-10-24 11:37:15 +04:00

CMakeLists.txt

Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib

2015-03-03 12:52:03 +00:00