From: Mario Date: Fri, 14 Jul 2017 23:51:47 +0000 (+0000) Subject: Merge branch 'detrate/feature/encode-demos' into 'master' X-Git-Tag: xonotic-v0.8.5~202 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=243220bae3789792389d8985d4a52f101809f4f4;p=xonotic%2Fxonotic.git Merge branch 'detrate/feature/encode-demos' into 'master' Added command to convert video to gif to encode-demos.sh See merge request !26 --- 243220bae3789792389d8985d4a52f101809f4f4