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)
commit923c8fc119df8210450991c59b8567e2352e9412
tree040f87d4c429a0b8efaa13624b12bac24377132b
parentbac64fabd29370fda09e3a4dd6b043a8bb6ffc0d
parent9a906a5988b16962e905bf2a3a0233fbfe0c147a
Merge branch 'master' into mirio/balance
bal-wep-xonotic.cfg
bal-wep-xpm.cfg