Alexander Alekhin a4e35d83ff Merge pull request #6267 from dtmoodie:issue_5918

2016-03-21 09:37:11 +00:00

..

include/opencv2

ximea new param

2016-02-17 11:18:49 +01:00

misc/java/test

…

perf

…

src

Merge pull request #6267 from dtmoodie:issue_5918

2016-03-21 09:37:11 +00:00

test

Merge 2.4 into master

2015-12-08 10:24:54 +03:00

CMakeLists.txt

- removed whitespaces

2016-01-25 13:13:13 +01:00