Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:20:55 +0000 (00:20 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:20:55 +0000 (00:20 +0100)
commitee7863d9cdd683dd4df9d6463d98dc59182c54fe
tree9b54b69417c686e1fc18b933d365f382279894fe
parent9e219b96e914b2e5709ba3c3345afdc3cf13a78d
parent45955bca8c14dd8cac4fa922e45fb0f8be507d58
Merge branch 'master' into epoxy

Conflicts:
Makefile.in
README
movit.pc.in
12 files changed:
Makefile.in
README
blur_effect.cpp
complex_modulate_effect.cpp
configure.ac
effect_chain.cpp
effect_chain.h
effect_util.cpp
effect_util.h
movit.pc.in
util.cpp
util.h