Alexander Alekhin 4e8f8922e2 Merge pull request #7170 from alalek:fix_build		2016-08-29 10:15:58 +00:00
..
include/opencv2	Unifies Obj-C property attributes changing retain to strong	2016-08-25 21:40:16 +03: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 #7170 from alalek:fix_build	2016-08-29 10:15:58 +00:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	- removed whitespaces	2016-01-25 13:13:13 +01:00