Roman Donchenko 10aec14a4d Merge pull request #1849 from StevenPuttemans:feature_3375_documentation		2013-11-27 13:22:31 +04:00
..
doc	Applied feature #3375 and fix of pull 1842 to avoid merging problems later	2013-11-25 10:53:03 +01:00
include/opencv2/highgui	Normalized file endings.	2013-08-21 18:59:25 +04:00
perf	Normalized file endings.	2013-08-21 18:59:25 +04:00
src	Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea	2013-11-21 12:03:02 +04:00
test	Replaced the image used in the Highgui_Video.ffmpeg_image test.	2013-11-11 18:30:04 +04:00
CMakeLists.txt	Trailing whitespace removal.	2013-11-11 10:26:28 +01:00