Roman Donchenko 4db12032dc Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

No conflicts! Amazing!

2014-04-21 16:47:35 +04:00

..

doc

Deleted all trailing whitespace.

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

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-04-21 16:47:35 +04:00

src

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

CMakeLists.txt

Normalized file endings.

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