]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 30 Apr 2013 19:52:20 +0000 (05:52 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 30 Apr 2013 19:52:20 +0000 (05:52 +1000)
commit8360336fa2725c644dc19cbceb9eaad56f3da9cc
tree5c7598008f78a603510af13489171ab073bbddc7
parent8f826984263dac5e164f6741af604694353a7f5c
parent27e0dcee207c9b4ab3e36bde11dee4dcb260bd13
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg
qcsrc/menu/classes.c