]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Thu, 11 Jul 2013 23:13:48 +0000 (09:13 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 11 Jul 2013 23:13:48 +0000 (09:13 +1000)
commit624a2c9a6f5d3b9a91f5f935ee9ac59c83ad24bd
tree1c7c70dee01f0ff9f20f1666d18f5f14cb8bcd11
parentb7948bdfd215689f16cacc3467944f2517a2f5a8
parent0031d67392b186b59957ab98309935c10f93de02
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/miscfunctions.qc