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
|
f886651cf0
|
Drop old python samples and tests
|
2013-04-12 19:37:40 +04:00 |
|
Roman Donchenko
|
57d4c86b2b
|
Fixed the shebang lines on the Python scripts.
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
|
2013-04-11 18:37:23 +04:00 |
|
Moshe Kaplan
|
bd042d9cc3
|
Fixed shebangs, added error checking
|
2013-03-06 01:41:02 -05:00 |
|
marina.kolpakova
|
285d6320be
|
add #/usr/bin/env python to all python files
|
2012-11-23 22:57:22 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Alexander Mordvintesv
|
a4bffd96c4
|
added deconvolution.py sample and example images
|
2012-08-18 19:43:32 +03:00 |
|