]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 4 Jun 2013 00:10:43 +0000 (10:10 +1000)
commite8b6542f46abb4c4ae2afde8d37eff347ab8a33e
tree5fa0bbb709db0220039dde6bb31f2cdc1275eeea
parentda156245f16deb1f37359098d00ee2559b7d89e1
parentee4e792a2aae52946b7f216a1db46e3e3b9dfbb8
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc
qcsrc/server/mutators/gamemode_ctf.qc