Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 22 Mar 2014 14:53:11 +0000 (15:53 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 22 Mar 2014 14:53:11 +0000 (15:53 +0100)
commit5ee3e6bb0bf100d57a06911b89c3a0a0dc49e2be
treede285de9e4d9403502b22c0de29b30fd88908d68
parentddf71f853e64c3912eed4ab98bfe7503826ce8e1
parent9b0bd744d606d9d92bd955e0e575c73aa505073d
Merge branch 'master' into epoxy
effect_chain.cpp
effect_chain.h