6 Commits

Author	SHA1	Message	Date
Andrey Kamaev	0738ea7d0f	Make highgui.hpp independent from C API	2013-04-08 15:47:29 +04:00
Andrey Kamaev	67073daf19	Merge branch '2.4'	2013-04-05 21:11:59 +04:00
Vladislav Vinogradov	9086efa8e9	fixed warnings	2013-04-02 13:24:00 +04:00
Andrey Kamaev	71e43852ce	Fix MSVC build issues	2013-04-01 15:24:34 +04:00
Andrey Kamaev	1ca8f33b4e	Merge branch '2.4'	2013-03-21 23:11:54 +04:00
Vladislav Vinogradov	7a0d6f7733	Super Resolution module	2013-02-27 13:41:15 +04:00