minor chnges for conflict removal
authoralexandre benoit <benoit.alexandre.vision@gmail.com>
Mon, 29 Apr 2013 13:12:44 +0000 (15:12 +0200)
committeralexandre benoit <benoit.alexandre.vision@gmail.com>
Mon, 29 Apr 2013 13:12:44 +0000 (15:12 +0200)
commit95499492285f9e41a3e951af3526168b8c60b861
tree0c30a5677e11718daee627b1155fec60d2f0607b
parent16dea7b90de16edeb2dd7b7a815c460541e51b39
minor chnges for conflict removal
doc/tutorials/contrib/retina_model/retina_model.rst
doc/tutorials/definitions/tocDefinitions.rst
modules/contrib/doc/retina/index.rst
modules/contrib/include/opencv2/contrib/retina.hpp
modules/contrib/src/retina.cpp
samples/cpp/tutorial_code/contrib/retina_tutorial.cpp