From: Mario <zacjardine@y7mail.com>
Date: Sun, 26 Feb 2017 14:35:52 +0000 (+0000)
Subject: Merge branch 'detrate/feature/encode-demos' into 'master'
X-Git-Tag: xonotic-v0.8.2~8
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=331db7c58d2011091e7c35776c841497e19a8501;hp=-c

Merge branch 'detrate/feature/encode-demos' into 'master'

encode-demos.sh, headless parallel encoding

See merge request !22
---

331db7c58d2011091e7c35776c841497e19a8501