Matti Picus dc50dc7254 fix merge

2014-02-21 13:54:58 +02:00

..

doc

Merge pull request #1845 from StevenPuttemans:bugfix_3306

2013-11-29 23:08:20 +04:00

include/opencv2/highgui

Delete end comma in enumerations

2013-12-18 11:46:52 +04:00

perf

Normalized file endings.

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

src

merge with origin

2014-02-21 11:59:49 +02:00

test

fix merge

2014-02-21 13:54:58 +02:00

CMakeLists.txt

All installed files marked with component names for install customization.

2014-01-21 20:34:36 +04:00