Merge branch 'master' of code.opencv.org:opencv
authoralexandre benoit <benoit.alexandre.vision@gmail.com>
Thu, 4 Jul 2013 14:19:24 +0000 (16:19 +0200)
committeralexandre benoit <benoit.alexandre.vision@gmail.com>
Thu, 4 Jul 2013 14:19:24 +0000 (16:19 +0200)
commit188f8899498b8963affc086cabba8ac70282d190
tree7f1beb92a46f01a5cb8347495dad0bdbe6676d94
parentc39159069e5b151d597dd0d8298b0f81c6a47c69
parent70deda354a3cd7b73b2278185e26e417dfffbc10
Merge branch 'master' of code.opencv.org:opencv