Andrey Kamaev 17fd1c7c61 Merged recent changes from trunk - 8833,8848,8850		2012-06-29 07:52:34 +00:00
..
androidcamera	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
calib3d	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
contrib	Fixed few warnings	2012-06-28 18:11:54 +00:00
core	Merged recent changes from trunk - 8833,8848,8850	2012-06-29 07:52:34 +00:00
features2d	Merged recent changes from trunk - 8833,8848,8850	2012-06-29 07:52:34 +00:00
flann	merged the trunk r8719:8731 and 8807	2012-06-28 16:39:53 +00:00
gpu	fixed merge problem	2012-06-28 17:54:08 +00:00
highgui	Merged recent changes from trunk - 8833,8848,8850	2012-06-29 07:52:34 +00:00
imgproc	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
java	Merged Android build fix	2012-06-28 19:32:32 +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 r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +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 r8704:8716	2012-06-28 16:13:29 +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 r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +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