Merge pull request #884 from pengx17:2.4_pyrup_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 15 May 2013 10:18:53 +0000 (14:18 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 15 May 2013 10:18:54 +0000 (14:18 +0400)
commit4d866ea32e19993c6fb2343363d440cd82ce91d6
treec4934def16f22a3a90e072a2d440188d1132f287
parent2a646f7626f732e6cf5368cbaae4f109487b81c5
parent1ecc76590351d8751f844ed7cc5b6158b7bb2553
Merge pull request #884 from pengx17:2.4_pyrup_fix