Merge pull request #5274 from ilya-lavrenov:features2d
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 1 Sep 2015 10:14:28 +0000 (10:14 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 1 Sep 2015 10:14:29 +0000 (10:14 +0000)
commit5b1967f80c6571f1fb011a62429f9956c1cb76e7
treed2a35e524561b151ad05a668afdf7fbbaacabf0d
parent74f5eaf70c0a96b4d7f98be32cc7f8beb74c1705
parentdc441f50cd546a79ecb5e4390411549325cac68e
Merge pull request #5274 from ilya-lavrenov:features2d