Andrey Kamaev 088a6597bc Merged the trunk 8855,8885,8886

2012-07-02 12:05:06 +00:00

..

androidcamera

merged the trunk r8704:8716

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

calib3d

Merged the trunk r8852:8880

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

contrib

Merged facerec from the trunk

2012-07-02 11:48:16 +00:00

core

Merged the trunk r8852:8880

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

features2d

Merged the trunk 8855,8885,8886

2012-07-02 12:05:06 +00:00

flann

merged the trunk r8719:8731 and 8807

2012-06-28 16:39:53 +00:00

gpu

fixed #2113

2012-06-30 09:37:40 +00:00

highgui

Merged the trunk r8852:8880

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

imgproc

Merged the trunk 8855,8885,8886

2012-07-02 12:05:06 +00:00

java

Merged the trunk 8855,8885,8886

2012-07-02 12:05:06 +00:00

legacy

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

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

ml

Merged the trunk r8852:8880

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

nonfree

merged trunk r8815:8827

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

objdetect

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

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

photo

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

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

python

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

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

stitching

Merged the trunk r8852:8880

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

ts

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

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

video

Merged the trunk r8852:8880

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

videostab

Reverted some changes in videostab module

2012-06-28 17:48:53 +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