Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 15 Mar 2014 02:12:53 +0000 (03:12 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 15 Mar 2014 02:12:53 +0000 (03:12 +0100)
commitdaca930fb2f404e8800c35715f1fc5c4897d19fb
tree28a265bb38077fff9599e8938947462983f87019
parentc5b9c3df43caa7a88f2f729a5c52359ca8ca537f
parent6462d4df1986c76e363cf21ee0c7734d1b312635
Merge branch 'master' into epoxy
fft_pass_effect.cpp
fft_pass_effect_test.cpp