Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
authorMatthias Bady <aegirxx@gmail.com>
Mon, 23 Dec 2013 18:47:06 +0000 (19:47 +0100)
committerMatthias Bady <aegirxx@gmail.com>
Mon, 23 Dec 2013 18:47:06 +0000 (19:47 +0100)
commit928924d24838b6bd89d294343c96793f2dcc02fe
treeb6c6e6711a6c7980f5a9c98c0be51e768a5f5589
parenta032d947b4d6701ed9cf967ffe022525a753d1b4
parent0966e5ffa16f515f3156408c5c19e8c1ec075fa1
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
modules/ocl/include/opencv2/ocl.hpp