]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit84f0ef2e09d581da11433fa029cc9b44f4b58092
tree770d5034799b02eea1644536b8790d8fbe696b85
parent7641890b1d739a3b96966c0676f9cceee0a8b030
parentf1ead602997113ae2cb58dbd08ce456e5c712b3b
Merge branch 'master' into martin-t/okc3
defaultServer.cfg
qcsrc/server/g_damage.qc