Merge branch 'master' of code.opencv.org:opencv
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:09:04 +0000 (16:09 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:09:04 +0000 (16:09 +0400)
commitcd58b7e1549b36839d44bd846468a2c9b0b05188
tree386d9b99ba98021f183a41d165048c6a62e9698f
parent76d46e20de34297235594fafb8f83e36d85a560e
parentce9b97c78ceede766183a38b15d206d807355e22
Merge branch 'master' of code.opencv.org:opencv