Merge branch 'master' into Mario/weapons
[xonotic/xonotic-data.pk3dir.git] / balance-xonotic.cfg
2014-06-15 MarioMerge branch 'master' into Mario/weapons
2014-06-15 MarioMerge branch 'samual/weapons' into Mario/weapons
2014-04-07 Rudolf PolzerMerge branch 'master' into samual/weapons
2014-03-22 MarioAdd a new ammo type: plasma
2014-03-09 Samual LenksMerge remote-tracking branch 'origin/master into samual...
2014-02-26 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-02-17 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-06 MarioMerge branch 'master' into samual/weapons
2014-01-05 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2014-01-01 Samual LenksMerge remote-tracking branch 'origin/master' into samua...
2013-12-30 MarioRename uzi to machinegun
2013-12-23 MarioRename nex to vortex
2013-12-16 MarioRename minstanex to vaporizer
2013-12-12 Rudolf PolzerMerge branch 'divVerent/ballistic2' into samual/weapons
2013-12-08 Samual LenksUpdate configs to match new system (sort of)