Marina Kolpakova 37a63523e7 fixed merge problem

2012-06-28 17:54:08 +00:00

..

doc

Megred fix for pyrhon API generator regression r8528

2012-05-31 11:12:12 +00:00

include/opencv2/gpu

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

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

perf

fixed merge problem

2012-06-28 17:54:08 +00:00

src

merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

2012-06-28 17:07:17 +00:00

test

merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00

CMakeLists.txt

changing package layout after 'make install' for Android build

2012-06-28 17:23:50 +00:00