Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
75513a46dc
|
Remove all include directives for <string>
|
2013-03-22 22:14:47 +04:00 |
|
Andrey Kamaev
|
81a5988015
|
Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)
|
2012-05-30 11:13:07 +00:00 |
|
Andrey Kamaev
|
a20248977c
|
Documentation: fixed class/struc members documentation; added warning on incorrectly documented member
|
2012-05-29 16:55:46 +00:00 |
|
Andrey Kamaev
|
6ca618277c
|
More fixes for documentation.
|
2012-05-28 20:11:38 +00:00 |
|
Andrey Kamaev
|
eb2f1f81ed
|
Fixed hundreds of documentation problems
|
2012-05-28 07:36:14 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Ilya Lysenkov
|
2619221331
|
Spell checked the documentation with VIM (issue #223)
|
2012-04-13 19:04:44 +00:00 |
|
Andrey Kamaev
|
ec793df30f
|
#1205 fixed more bugs/typos in parameters
|
2012-03-29 08:07:57 +00:00 |
|
Andrey Kamaev
|
aeaae8b057
|
Updated rst configuration to read OpenCV version from sources; fixed several sphinx' warnings
|
2012-03-02 20:59:13 +00:00 |
|
Maria Dimashova
|
36967575be
|
Added doc on c++ version of latent svm
|
2011-10-04 12:10:57 +00:00 |
|
Maria Dimashova
|
b3fb4986f2
|
restored doc on latent svm that was lost in moving to rst
|
2011-09-30 09:54:31 +00:00 |
|