projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8415b90 7dd3723)
Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap
authorLaurentBerger <laurent.berger@univ-lemans.fr>
Mon, 26 Dec 2016 16:03:52 +0000 (17:03 +0100)
committerLaurentBerger <laurent.berger@univ-lemans.fr>
Mon, 26 Dec 2016 16:03:52 +0000 (17:03 +0100)

Trivial merge
Domain: Multimedia / Media Vision;