]> git.sesse.net Git - movit/commitdiff
Merge branch 'epoxy'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 28 Mar 2014 20:15:05 +0000 (21:15 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Fri, 28 Mar 2014 20:17:41 +0000 (21:17 +0100)
Conflicts:
effect_chain.cpp
resource_pool.cpp


No differences found