Andrey Pavlenko 429ab8ebee Merge pull request #1845 from StevenPuttemans:bugfix_3306		2013-11-29 23:08:20 +04:00
..
doc	Merge pull request #1845 from StevenPuttemans:bugfix_3306	2013-11-29 23:08:20 +04:00
include/opencv2/highgui
perf
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