]> git.sesse.net Git - movit/commitdiff
projects / movit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12c11c0 7d7149e)
Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:37:35 +0000 (12:37 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 9 Mar 2014 11:37:35 +0000 (12:37 +0100)
1  2 
demo.cpp patch | diff1 | diff2 | blob | history

diff --cc demo.cpp
Simple merge
A library for high-quality, high-performance video filters.