Andrey Pavlenko 89086bdb8d Merge pull request #1046 from SpecLad:merge-2.4		2013-07-02 15:39:07 +04:00
..
doc	Added missing python functions in highgui documentation	2013-06-24 15:53:45 +05:30
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-06-25 15:55:52 +04:00
perf	Make highgui.hpp independent from C API	2013-04-08 15:47:29 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-06-25 15:55:52 +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'	2013-06-19 15:25:37 +04:00