Merge pull request #6214 from vonnieda:java_features2d
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Mon, 21 Mar 2016 11:51:11 +0000 (11:51 +0000)
commitf3127521f3fbbc1b2db18f5ae333cafb5861b25a
treef01586949111ff2ce49d19db0666f4d88d6b9868
parenta4e35d83ff44464a7562cfe4779e577623dc4e23
parentf4b502dd0341c58354b98c5fe24e14296ed7e97d
Merge pull request #6214 from vonnieda:java_features2d