Vadim Pisarevsky 65e4df751c Merge pull request #3705 from SpecLad:unused-nNull		2015-02-19 18:40:22 +00:00
..
doc	Merge pull request #3471 from HelenWong:FixBug3714	2014-12-22 10:55:23 +00:00
include/opencv2	Merge pull request #3514 from mshabunin:compat-24	2014-12-22 10:38:56 +00:00
perf	Normalized file endings.	2013-08-21 18:59:25 +04:00
src	Merge pull request #3705 from SpecLad:unused-nNull	2015-02-19 18:40:22 +00:00
test	fixed issue with malformed UTF-8 string;	2014-10-27 12:47:53 +03:00
CMakeLists.txt	Fixed CMake issue with FFMPEG highgui configuration	2014-09-23 23:46:03 +02:00