From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Tue, 23 Oct 2012 16:39:02 +0000 (+0400)
Subject: Merge branch '2.4'
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1259
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91f47d27794bbcf7e4e4582875923643230d57d7;p=profile%2Fivi%2Fopencv.git

Merge branch '2.4'

Conflicts:
	modules/core/include/opencv2/core/version.hpp
---

91f47d27794bbcf7e4e4582875923643230d57d7