Merge pull request #940 from SpecLad:autolock
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)
commitf527b6a93f3deefec8718baded7df0e7e232071b
tree3188c00550689ea7187fc6d0263d4af0ea4af7e4
parent119b7a298def5889c7294bf5627dd1463f909972
parent8a4090fe3f6daa00f5421e2b9fefd2f14790c126
Merge pull request #940 from SpecLad:autolock