merge with upstream
authorMatthias Bady <aegirxx@gmail.com>
Sun, 5 Jan 2014 18:00:25 +0000 (19:00 +0100)
committerMatthias Bady <aegirxx@gmail.com>
Sun, 5 Jan 2014 18:00:25 +0000 (19:00 +0100)
commite17da9a843fc99b590bed3d7ce7f0a5101a8ed17
treeaa2d18dd9ed86869968905f5eea6b9d1ad9e9c0f
parent928924d24838b6bd89d294343c96793f2dcc02fe
parent1c3bfae2121f689535ab1a17284f40f5d64e0927
merge with upstream
modules/ocl/doc/feature_detection_and_description.rst
modules/ocl/include/opencv2/ocl.hpp