Merge branch 'master' into Mirio/balance
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
1  2 
bal-wep-xonotic.cfg
bal-wep-xpm.cfg

Simple merge
diff --cc bal-wep-xpm.cfg
Simple merge