projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8dbde32 9b149ed)
Merge branch '2.4'
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:39:02 +0000 (20:39 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 23 Oct 2012 16:39:02 +0000 (20:39 +0400)
Conflicts:
modules/core/include/opencv2/core/version.hpp


Trivial merge
Domain: Multimedia / Media Vision;