]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Feb 2018 12:49:04 +0000 (13:49 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Feb 2018 12:49:04 +0000 (13:49 +0100)
1  2 
defaultServer.cfg
qcsrc/server/g_damage.qc

Simple merge
Simple merge