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)
commitddf71f853e64c3912eed4ab98bfe7503826ce8e1
treebec6b49054e2d5205515cc4ef57fb1f951672a17
parentb2fadf373646bc99eeb30a285d48ea9fd2b98fda
parent0cdd6e9e30a807056699ed9b3fa023a23ce83af9
Merge branch 'master' into epoxy

Conflicts:
flat_input.cpp
effect_chain.cpp
effect_chain.h
effect_chain_test.cpp
resource_pool.cpp
resource_pool.h