Merge branch 'master' of git://code.opencv.org/opencv
authorPhilipp Wagner <bytefish@gmx.de>
Sun, 29 Jul 2012 20:20:48 +0000 (22:20 +0200)
committerPhilipp Wagner <bytefish@gmx.de>
Sun, 29 Jul 2012 20:20:48 +0000 (22:20 +0200)
commitf160c494733365ba52b64bebb550401e9fcf85a3
tree64324465cf242d74d421bafb498ff021d25b5e03
parent79b45b13927e870a7e588ee0fb60d565205aa2be
parentf1690557bf9891301f4105075d6d34741e9bcfc8
Merge branch 'master' of git://code.opencv.org/opencv