Merge branch 'master' into mirio/balance
authorMirio <opivy@hotmail.de>
Wed, 2 Mar 2016 19:58:47 +0000 (20:58 +0100)
committerMirio <opivy@hotmail.de>
Wed, 2 Mar 2016 19:58:47 +0000 (20:58 +0100)
1  2 
bal-wep-xonotic.cfg
bal-wep-xpm.cfg

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