Merge branch 'master' of https://github.com/Itseez/opencv
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Wed, 23 Jul 2014 12:21:45 +0000 (14:21 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Wed, 23 Jul 2014 12:21:45 +0000 (14:21 +0200)
commitd7038423dd06dd47c3ffb0631a8954c7cd228ceb
tree8feec31b758e2fa639d84c0ed27946103d8f5f81
parent6a769c92b3b6bcfb6c312fe4df9dd908fd354ae2
parentda1ac359304df7e3a933e83babc5be5f49bc48a9
Merge branch 'master' of https://github.com/Itseez/opencv