]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:00:41 +0000 (18:00 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 14 Aug 2018 16:00:41 +0000 (18:00 +0200)
commita1b5193fe8388812267a165c966d7eeeea47d72a
tree5fed77bdc691e85eb59d52b7168eb5d911e462dc
parentbda99a9b14d7bcc894ea86c4948dffafd393572a
parentccc3a299c7bb000bd51bf1559173f0002e435f8a
Merge branch 'master' into martin-t/okc3
balance-mario.cfg
balance-overkill.cfg
balance-xdf.cfg
qcsrc/server/g_damage.qc