Merge branch 'master' of git://code.opencv.org/opencv
authorPhilipp Wagner <bytefish@gmx.de>
Thu, 9 Aug 2012 21:05:07 +0000 (23:05 +0200)
committerPhilipp Wagner <bytefish@gmx.de>
Thu, 9 Aug 2012 21:05:07 +0000 (23:05 +0200)
commit45e44442ad69fa672d1c8d24e48bf2116e9d1cb3
treef6421ca5a95467c6306ccc21bb013b0616f0a7ea
parent9db42aca048072320a867034a8c4cd20094bd44c
parenta682ee40adcf91ce8be61968356ba58478c729b7
Merge branch 'master' of git://code.opencv.org/opencv