Andrey Kamaev 91f47d2779 Merge branch '2.4'
Conflicts:
	modules/core/include/opencv2/core/version.hpp
2012-10-23 20:39:02 +04:00
..
2012-08-23 13:37:27 +04:00
2012-10-23 20:32:19 +04:00
2012-10-12 23:03:31 +04:00
2012-10-12 13:03:43 +04:00
2012-10-22 20:33:14 +04:00
2012-08-23 13:37:27 +04:00