Prof. Dr. Rudolf Haussmann e5e6367223 Merge remote-tracking branch 'upstream/2.4' into 2.4

2015-03-25 13:38:49 +01:00

..

doc

fix bug 3714 2.4 branch

2015-02-20 12:39:31 +01:00

include/opencv2

Changes to be committed:

2015-03-20 01:42:16 +01:00

perf

Normalized file endings.

2013-08-21 18:59:25 +04:00

src

Merge remote-tracking branch 'upstream/2.4' into 2.4

2015-03-25 13:38:49 +01: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