]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into martin-t/deglob-log
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 11:21:30 +0000 (12:21 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Jan 2020 11:21:30 +0000 (12:21 +0100)
1  2 
xonotic-common.cfg

Simple merge