Merge branch 'master' into Mirio/balance
authorMirio <opivy@hotmail.de>
Sat, 30 Apr 2016 10:23:24 +0000 (12:23 +0200)
committerMirio <opivy@hotmail.de>
Sat, 30 Apr 2016 10:23:24 +0000 (12:23 +0200)
commit42e255d014f2c6a1871177ea511f630624cdfb57
tree9bac8a9e9b0a30e63350fcd3c6a03eef32aab04b
parente210d808c320b04a4f1a520bdb574439a97d66a8
parent598144e07b3ce7ce060e8271f7ddeee20a48cab0
Merge branch 'master' into Mirio/balance
bal-wep-xonotic.cfg
bal-wep-xpm.cfg