Andrey Kamaev 3a1f85d4e8 Remerged the 2.4.0 branch

2012-05-02 20:20:14 +00:00

..

doc

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

include/opencv2/core

Remerged the 2.4.0 branch

2012-05-02 20:20:14 +00:00

perf

File perf_addWeited.cpp added

2012-04-26 07:20:13 +00:00

src

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

test

merged 2.4 into trunk

2012-04-30 14:33:52 +00:00

CMakeLists.txt

Remerged the 2.4.0 branch

2012-05-02 20:20:14 +00:00