sprice 1c15776cf5 Merge branch 'master' of https://github.com/Itseez/opencv ...

Conflicts:
	modules/imgproc/src/sumpixels.cpp

2013-12-11 14:35:51 -08:00

..

doc

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

include/opencv2

Updating STAR detector and FREAK descriptor to work with large and/or 16-bit images

2013-12-04 18:13:34 -08:00

perf

Merge commit '43aec5ad' into merge-2.4

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

src

Merge branch 'master' of https://github.com/Itseez/opencv

2013-12-11 14:35:51 -08:00

test

fixed warnings

2013-10-08 12:46:43 +04:00

CMakeLists.txt

Normalized file endings.

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