projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4e35d8 f4b502d)
Merge pull request #6214 from vonnieda:java_features2d
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)

Trivial merge
Domain: Multimedia / Media Vision;