Merge branch 'master' of https://github.com/Nuzhny007/opencv
authorСергей Нужный <snuzhny@stc-spb.ru>
Wed, 8 Apr 2015 09:44:46 +0000 (12:44 +0300)
committerСергей Нужный <snuzhny@stc-spb.ru>
Wed, 8 Apr 2015 09:44:46 +0000 (12:44 +0300)
commit5c379aa1b83ddd66f67b1a9c2ccd00e5bac8576e
treeb90cd835120309b060c377ca0f18a6bf1324f97f
parente800800bec8596127274f359e744723a7371b5b7
parent3646967deb9b48f45c44203e5c96836a8a180218
Merge branch 'master' of https://github.com/Nuzhny007/opencv