]> git.sesse.net Git - cubemap/commitdiff
projects / cubemap / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 733fa64 3b2b74d)
Merge branch 'master' of /srv/git.sesse.net/www/cubemap
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 10 Apr 2013 21:36:59 +0000 (23:36 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Wed, 10 Apr 2013 21:36:59 +0000 (23:36 +0200)
1  2 
main.cpp patch | diff1 | diff2 | blob | history

diff --cc main.cpp
Simple merge
A scalable video reflector, designed to be used with VLC.