]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/balance_v2
authorMario <mario@smbclan.net>
Fri, 5 Feb 2016 11:41:35 +0000 (21:41 +1000)
committerMario <mario@smbclan.net>
Fri, 5 Feb 2016 11:41:35 +0000 (21:41 +1000)
commit88cada71f757dc552b46360e48673d7ceee850c1
tree687673c5c9a985c2a7206d2b954655768b8f2883
parent0e7e91039e8fa0e01c3f6df8330044a096f60be5
parentb424d85cd5234564f02f3605b5e5554d4d6bbdd1
Merge branch 'master' into Mario/balance_v2
bal-wep-xonotic.cfg
bal-wep-xpm.cfg