Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
authoryao <bitwangyaoyao@gmail.com>
Tue, 26 Feb 2013 12:30:42 +0000 (20:30 +0800)
committeryao <bitwangyaoyao@gmail.com>
Tue, 26 Feb 2013 12:30:42 +0000 (20:30 +0800)
commit3ff5689fe5608d4dfb1bb1334eceea11add469c1
treeea290035356bb8b7fa846b01d6db53aac092d312
parent59ebf4ed9f8b529af09036ae05508d8503582430
parent62f8b0fc489d8ea15c21a8ea469619f8c2349092
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4