]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db64c0e 2caacb2)
Merge branch 'detrate/feature/encode-demos' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 14 Jul 2017 23:51:47 +0000 (23:51 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 14 Jul 2017 23:51:47 +0000 (23:51 +0000)
Added command to convert video to gif to encode-demos.sh

See merge request !26

1  2 
misc/tools/encode-demos.sh patch | diff1 | diff2 | blob | history

diff --cc misc/tools/encode-demos.sh
Simple merge