Andrey Kamaev a66cd5698a Merged the trunk 8892,8894,8898

2012-07-02 13:06:28 +00:00

..

doc

Merged the trunk 8892,8894,8898

2012-07-02 13:06:28 +00:00

include/opencv2/core

Version number is adjusted to 2.4.2

2012-07-02 12:10:13 +00:00

perf

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00

src

Merged the trunk r8887, r8891, r8314

2012-07-02 12:33:37 +00:00

test

Merged the trunk r8852:8880

2012-07-02 11:04:43 +00:00

CMakeLists.txt

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00