Merge pull request #2850 from Sekunde:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:38:41 +0000 (21:38 +0400)
commitad7440c014f70cdbf60c3ff1b01a65af7c87d439
tree62de7b27c003c0af669a335da0f2fa18eb4918a0
parent14671e0cd67e9333f666a5f90ae43d9c5a05f208
parent055adc2302c3a2ac6f13c77b071fd160a05035ff
Merge pull request #2850 from Sekunde:master