]> git.sesse.net Git - movit/commitdiff
projects / movit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad27ef8 22c2b8f)
Merge remote-tracking branch 'origin/master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 22 Jan 2013 22:59:19 +0000 (23:59 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 22 Jan 2013 22:59:19 +0000 (23:59 +0100)
1  2 
gtest_sdl_main.cpp patch | diff1 | diff2 | blob | history

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