Marina Kolpakova 01570fa800 merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

..

androidcamera

merged the trunk r8704:8716

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

calib3d

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

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

contrib

merged the trunk r8704:8716

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

core

merged the trunk r8704:8716

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

features2d

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

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

flann

merged the trunk r8704:8716

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

gpu

merged the trunk r8704:8716

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

highgui

merged the trunk r8704:8716

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

imgproc

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

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

java

merged Android Manager and new java layout

2012-06-28 16:23:19 +00:00

legacy

merged the trunk r8704:8716

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

ml

merged the trunk r8704:8716

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

nonfree

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

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

objdetect

merged the trunk r8704:8716

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

photo

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

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

python

merged the trunk r8704:8716

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

stitching

merged the trunk r8704:8716

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

ts

merged the trunk r8704:8716

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

video

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

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

videostab

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

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

world

merged iOS framework from the trunk

2012-06-28 15:13:57 +00:00

CMakeLists.txt

Global CMake reorganization:

2012-02-03 11:26:49 +00:00

refman.rst.in

Merged the trunk r8517:8524

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