Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl
authorMatthias Bady <aegirxx@gmail.com>
Mon, 13 Jan 2014 17:14:56 +0000 (18:14 +0100)
committerMatthias Bady <aegirxx@gmail.com>
Mon, 13 Jan 2014 17:14:56 +0000 (18:14 +0100)
commit06fb073b8b58fc0f9ac75dcddb5464f4667453e2
tree71f96aba9ad104455d3f999b49eb68097d139b23
parente17da9a843fc99b590bed3d7ce7f0a5101a8ed17
parentc3bfe3f33e821e27dacc34a6c72e5a8ab038079e
Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl