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
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Alexander Shishkov
|
7e52a8d1b6
|
modify default css for search button (error #2654)
|
2012-12-24 18:26:02 +04:00 |
|
Andrey Kamaev
|
0e9405e591
|
Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation
|
2012-09-14 22:26:32 +04:00 |
|
Andrey Kamaev
|
9d6ccecfdd
|
Fixed layout in third Android tutorial
|
2012-08-17 18:15:15 +04:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Alexander Shishkov
|
9bfd50e6ae
|
merged revisions r7802,r7804,r7805 from 2.4 branch
|
2012-04-03 00:33:33 +00:00 |
|
Andrey Kamaev
|
67a98bfd24
|
Fixed search in html documentation (ticket #1232)
|
2011-08-12 07:23:54 +00:00 |
|
Andrey Kamaev
|
8442dab01d
|
Html documentation: fixed text wrapping for sidebar
|
2011-08-11 19:06:41 +00:00 |
|
Andrey Kamaev
|
50d1d711de
|
Added reference to Nvidia TADP into Android tutorial; refactored both Android tutorials; fixed some rst warnings
|
2011-08-10 09:45:17 +00:00 |
|
Vadim Pisarevsky
|
38e0f84876
|
corrected css style - use the same background color for all text elements.
|
2011-07-07 17:00:09 +00:00 |
|
Bernat Gabor
|
e18de3c6ab
|
Added the OpenCV with Visual Studio tutorial. Enhanced, extended the Windows Installation one. Some minor CSS changes to avoid unnecessary large spaces inside enumerations in the tutorials.
|
2011-07-06 00:01:27 +00:00 |
|
Bernat Gabor
|
6be9fbfa6d
|
Reformatted the TOC tables in tutorials to look just as good in PDFs as in HTML. Updated the default.css_t too for this. Added the "Windows Install" tutorial (with videos).
|
2011-07-04 11:04:56 +00:00 |
|
Bernat Gabor
|
762bc0f8af
|
Some reST syntax correction. Now the PDF documentation builds correctly under Windows using MIKTEX. Some update on the tutorial structure. Some CSS syntax correction. Windows Install Tutorial v0.4.
|
2011-06-30 00:41:41 +00:00 |
|
Vadim Pisarevsky
|
d5d0a2f8e0
|
propagated some more fixes from 2.3 branch to the trunk
|
2011-06-29 22:26:09 +00:00 |
|
Vadim Pisarevsky
|
f0624c08dc
|
propagated some more changes from 2.3 to trunk
|
2011-06-23 12:15:35 +00:00 |
|
Vadim Pisarevsky
|
7491596ef8
|
moved the new docs from docroot to doc
|
2011-05-09 16:34:47 +00:00 |
|