Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
commit144496bf79000c3971090195fbfedcb2cb22a0be
treece60083fcecba9c4ac751c852e639935f8b7b878
parent9e219b96e914b2e5709ba3c3345afdc3cf13a78d
parentd843bbc41c20e1f0abe25df5162423270af78896
Merge branch 'master' into epoxy

Conflicts:
Makefile.in
movit.pc.in
Makefile.in
README
complex_modulate_effect.cpp
configure.ac
movit.pc.in