projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6133aee 4c7ecf2)
Merge remote-tracking branch 'origin/master' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 09:37:33 +0000 (13:37 +0400)
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~


Trivial merge
Domain: Multimedia / Media Vision;