projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a98ee0d 3934d61)
Merge pull request #5297 from ilya-lavrenov:flann
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 4 Sep 2015 10:21:00 +0000 (10:21 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 4 Sep 2015 10:21:00 +0000 (10:21 +0000)

Trivial merge
Domain: Multimedia / Media Vision;