Merge branch 'master' of https://github.com/Itseez/opencv into brisk
authorcbalint13 <cristian.balint@gmail.com>
Tue, 28 Apr 2015 15:51:13 +0000 (18:51 +0300)
committercbalint13 <cristian.balint@gmail.com>
Tue, 28 Apr 2015 15:51:13 +0000 (18:51 +0300)
commit0039690f1101d212f94b2a072c6aba64d7a1e1a5
treed46eb32400c235b5bdde571e286d56dc21112dd2
parent0ded2984b8b735b4a159639e6b7c8313203b59ea
parent07e07655d409a468f67a438ad6d6c1512dc523c4
Merge branch 'master' of https://github.com/Itseez/opencv into brisk