projects / platform / upstream / opencv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb4bd6b 898b257)
merge to resolve conflict
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 26 Jun 2015 16:10:58 +0000 (19:10 +0300)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Fri, 26 Jun 2015 16:13:40 +0000 (19:13 +0300)
Conflicts:
samples/data/detect_blob.png


Trivial merge
Domain: Multimedia / Media Vision;