Merge branch 'master' of code.opencv.org:opencv
authorDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:17:44 +0000 (12:17 +0400)
committerDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:17:44 +0000 (12:17 +0400)
commit2b53d2e6a4484aacfbb0608289b92ff75019fee9
tree2f9c8221c41f900db9ad0f31b494f214632b2915
parentf4d4b0d742a5905c16908ff28b6a81f4d47043c6
parent14fa6450260ec1af6077e229dd0abdd1b1e48f40
Merge branch 'master' of code.opencv.org:opencv