projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c58943 83cdd43)
Merge commit '83cdd43a' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)
Conflicts:
modules/core/include/opencv2/core/version.hpp


Trivial merge
Domain: Multimedia / Media Vision;