merge to resolve conflict

Conflicts:
	samples/data/detect_blob.png
This commit is contained in:
Alexander Alekhin 2015-06-26 19:10:58 +03:00
commit f56563d6fe

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 33 KiB