Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix
authorpeng xiao <hisenxpress@gmail.com>
Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)
committerpeng xiao <hisenxpress@gmail.com>
Wed, 15 May 2013 00:55:43 +0000 (08:55 +0800)
commit1ecc76590351d8751f844ed7cc5b6158b7bb2553
treec4934def16f22a3a90e072a2d440188d1132f287
parentdf3997b108600d95835944c26cb98e7bbdcdbf18
parent2a646f7626f732e6cf5368cbaae4f109487b81c5
Merge branch '2.4' of https://github.com/Itseez/opencv into 2.4_pyrup_fix