Mathieu Barnachon 67525627db Merge remote-tracking branch 'upstream/master' into bow_desc ...

Conflicts:
	modules/features2d/src/bagofwords.cpp

2013-11-24 14:21:44 +01:00

..

doc

Merge remote-tracking branch 'upstream/master' into bow_desc

2013-11-24 14:21:44 +01:00

include/opencv2

Merge remote-tracking branch 'upstream/master' into bow_desc

2013-11-24 14:21:44 +01:00

perf

Merge commit '43aec5ad' into merge-2.4

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

src

Merge remote-tracking branch 'upstream/master' into bow_desc

2013-11-24 14:21:44 +01: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