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)
1  2 
effect_chain.cpp
effect_chain.h

Simple merge
diff --cc effect_chain.h
Simple merge