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)
commitf56563d6fe751e00e822da4131501e7bd1628f7a
tree1c9ee945adbcf1d9028bc7b8d89f1a05dd3af73b
parenteb4bd6b4fb7f926543df4b635a3a4a9da3d78bee
parent898b25726178c59b8d0c294846869946467562fb
merge to resolve conflict

Conflicts:
samples/data/detect_blob.png