]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Feb 2018 18:05:00 +0000 (19:05 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Feb 2018 18:05:00 +0000 (19:05 +0100)
commitbda99a9b14d7bcc894ea86c4948dffafd393572a
treebc58c062e346074cbbe90b223a27a5d0639765b6
parent19ad7dc5d62acfd72f90f9bafafa07e8f6efccb7
parentcbd5749bf3064a7b8cde93d3e366719fc9ca1f6a
Merge branch 'master' into martin-t/okc3
qcsrc/server/g_damage.qc
xonotic-server.cfg