git.sesse.net Git - movit/commit

]> git.sesse.net Git - movit/commit

projects / movit / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: daca930 3ccf5fb)

author	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Sun, 16 Mar 2014 18:36:25 +0000 (19:36 +0100)
committer	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Sun, 16 Mar 2014 18:37:16 +0000 (19:37 +0100)
commit	9e219b96e914b2e5709ba3c3345afdc3cf13a78d
tree	b246954b2506f9458066c4405a655ca6320de81b	tree \| snapshot
parent	daca930fb2f404e8800c35715f1fc5c4897d19fb	commit \| diff
parent	3ccf5fb197c9a72545affc0b7286349d5603b72e	commit \| diff

Merge branch 'master' into epoxy

Conflicts:
Makefile.in
configure.ac

13 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
fft_convolution_effect.cpp	\|	diff2 \|	blob \| history
fft_convolution_effect.h	\|	diff2 \|	blob \| history
fft_convolution_effect_test.cpp	\|	diff2 \|	blob \| history
fft_input.cpp	\|	diff2 \|	blob \| history
fft_input.h	\|	diff2 \|	blob \| history
slice_effect.cpp	diff1 \|	diff2 \|	blob \| history
slice_effect.h	diff1 \|	diff2 \|	blob \| history
slice_effect_test.cpp	diff1 \|	diff2 \|	blob \| history
util.cpp	diff1 \|	diff2 \|	blob \| history
util.h	diff1 \|	diff2 \|	blob \| history

A library for high-quality, high-performance video filters.