projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c5292c2) | patch
trying to resolve the merge conflict
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 10:46:08 +0000 (14:46 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 17 Oct 2014 10:46:08 +0000 (14:46 +0400)
commitf6f839eb3c37a6d676910d98ecf196d16d609e58
tree68b50ce52326ce44ae7c2cc8ea08721515870b20tree | snapshot
parentc5292c25493d093943fc3621140d07c68d4cac2acommit | diff
trying to resolve the merge conflict
modules/features2d/src/orb.cpp diff | blob | history
Domain: Multimedia / Media Vision;