Roman Donchenko 9b7e77ccda Merge commit '83cdd43a' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
2013-12-30 16:36:35 +04:00
..
2013-05-27 11:10:38 +04:00
2013-05-27 11:10:38 +04:00
2013-08-21 18:59:25 +04:00

See http://opencv.org/android