edgarriba 1dec1645e5 Merge branch 'master' of https://github.com/Itseez/opencv		2014-08-12 16:45:22 +02:00
..
opencv2	Merge branch 'master' of https://github.com/Itseez/opencv	2014-08-12 16:45:22 +02:00