Andrey Kamaev f666bd221f Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00

..

doc

Merged the trunk r8517:8524

2012-05-31 10:53:28 +00:00

include/opencv2/highgui

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

2012-06-15 13:04:17 +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 r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00

test

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

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

CMakeLists.txt

Merged the trunk r8595:8668 (except iOS and new gpu functionality)

2012-06-15 13:21:26 +00:00