Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 22 Mar 2014 13:57:53 +0000 (14:57 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 22 Mar 2014 13:57:53 +0000 (14:57 +0100)
Conflicts:
flat_input.cpp

1  2 
effect_chain.cpp
effect_chain.h
effect_chain_test.cpp
resource_pool.cpp
resource_pool.h

Simple merge
diff --cc effect_chain.h
Simple merge
Simple merge
Simple merge
diff --cc resource_pool.h
Simple merge