Alexander Alekhin 07711e404b Merge pull request #7506 from mshabunin:x11-collide-warning		2016-10-17 19:50:30 +00:00
..
doc	Removed Sphinx documentation files	2014-12-26 19:12:19 +03:00
include/opencv2	Merge pull request #7506 from mshabunin:x11-collide-warning	2016-10-17 19:50:30 +00:00
misc/python	Adding of user-defined type conversions for python bindings inside module directories	2016-08-16 13:10:17 +03:00
perf	continue fixing nonfree elements	2014-08-28 13:30:47 +02:00
src	Added AKAZE features in the stitcher pipeline (issue #6474)	2016-10-06 17:47:20 +02:00
test	eliminate compiler warnings	2016-10-08 02:19:43 +03:00
CMakeLists.txt	fix cyclic deps error (world,shared)	2015-06-22 20:14:30 +03:00