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)
commit34e7f534e2015466228eb3a78c9857741b736dca
treec8d80ebe4d0b67ef9ef86e8d88bb9530422e00f5
parent8ba1f6c672361186033b8bebc3be677ac94bd4da
parent19eeff94eee19c8ed811eab52fc1a6b539c9d91b
Merge branch 'master' into Mirio/balance
bal-wep-xonotic.cfg
bal-wep-xpm.cfg