Merge pull request #228 from Nerei:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 16 Dec 2012 18:15:07 +0000 (22:15 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 16 Dec 2012 18:15:07 +0000 (22:15 +0400)
commitd6add763c7203a3f8fd08d1fd30ec258996c958b
tree7af115910e3ba2218bea2e4ab81f474ce12f3c56
parentaabb40e34df8f897b069c2473b92dff161ba6514
parent94c310fc14fef8a8d0bbca6f4e5e26212bfba124
Merge pull request #228 from Nerei:master