]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'master' into Lyberta/d0BuildFix
authorLyberta <lyberta@lyberta.net>
Thu, 19 Apr 2018 15:39:06 +0000 (18:39 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 19 Apr 2018 15:39:06 +0000 (18:39 +0300)
1  2 
misc/tools/all/xonotic.subr

Simple merge