Alexander Alekhin 0f298a4203 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-05-28 11:22:55 +00:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	build: fix warnings	2018-04-24 16:15:22 +03:00
misc	java(test): fix test names	2018-01-12 19:14:00 +00:00
perf	read in gray scale mode when writing a gray scale video	2018-02-19 18:33:05 +09:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-05-28 11:22:55 +00:00
test	build: fix warnings	2018-04-24 16:15:22 +03:00
CMakeLists.txt	Merge pull request #11532 from paroj:realsense	2018-05-21 15:59:46 +00:00