Merge pull request #2311 from SvenWe:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Feb 2014 13:11:06 +0000 (17:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Feb 2014 13:11:06 +0000 (17:11 +0400)
commit511e79aef7d232b1e0da94ba81c15fd0bf727b0c
tree89bf924ed59db752e20a0bb003816b25b99396b0
parent1cef6f9fb17d80044bc5976a603e95daeeeee352
parentf7041bacc0095f51d36194f09b74ea179e46f12d
Merge pull request #2311 from SvenWe:master