Roman Donchenko 7c4e3715b3 Merge pull request #975 from SpecLad:merge-2.4		2013-06-11 17:28:26 +04:00
..
doc	Updated documentation to new "COLOR_" format for color conversion enums.	2013-06-05 21:59:01 -04:00
include/opencv2	removed ogl::Texture2D support from InputArray	2013-06-10 12:40:30 +04:00
perf	Make highgui.hpp independent from C API	2013-04-08 15:47:29 +04:00
src	removed ogl::Texture2D support from InputArray	2013-06-10 12:40:30 +04:00
test	Make highgui.hpp independent from C API	2013-04-08 15:47:29 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-06-10 18:18:01 +04:00