Roman Donchenko 30d7e1c33d Merge remote-tracking branch 'origin/master' into merge-2.4 ... Conflicts: doc/tutorials/bioinspired/retina_model/retina_model.rst~		2013-10-02 13:37:33 +04:00
..
doc	Merge pull request #1526 from vpisarev:linedetector_python	2013-10-01 19:49:17 +04:00
include/opencv2	Merge pull request #1526 from vpisarev:linedetector_python	2013-10-01 19:49:17 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'origin/master' into merge-2.4	2013-10-02 13:37:33 +04:00
test	Merge pull request #1526 from vpisarev:linedetector_python	2013-10-01 19:49:17 +04:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00