Merge pull request #1 from Itseez/master
authorNuzhny007 <nuzhny@mail.ru>
Mon, 6 Apr 2015 13:24:53 +0000 (16:24 +0300)
committerNuzhny007 <nuzhny@mail.ru>
Mon, 6 Apr 2015 13:24:53 +0000 (16:24 +0300)
commit581923fa57108751f54a60f6204754d17d63b599
tree2f71ae1acf263b6c346cb921147a5c8e6d2b23b3
parent930808c22b467fd84d980063ce50f06912173706
parentac22c524fc6f0bba61a887406667776eb5418504
Merge pull request #1 from Itseez/master

merge with itseez/opencv/master