lluis 6ef1d456dd fixed rebase conflicts

2013-09-06 14:00:11 +02:00

..

doc

Merge commit '43aec5ad' into merge-2.4

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

include/opencv2

fixed rebase conflicts

2013-09-06 14:00:11 +02:00

perf

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

src

fixed rebase conflicts

2013-09-06 14:00:11 +02:00

test

Boring changes - objdetect.

2013-09-05 19:02:58 +04:00

CMakeLists.txt

Class-specific Extremal Region Filter algorithm as proposed in :

2013-07-20 01:10:05 +02:00