From: Rudolf Polzer Date: Wed, 4 Aug 2010 19:32:21 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~338 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=47c41285378461ea3aaffcb0e5d6f2df2c771185;hp=64e26c2fba740409c370ca95aed0e5cfb1ee59a1 Merge branch 'master' of ssh://git.xonotic.org/xonotic --- diff --git a/all b/all index c1da7075..b4f38b88 100755 --- a/all +++ b/all @@ -117,7 +117,7 @@ data/xonotic-nexcompat.pk3dir | mediasource | | master | darkplaces | | div0-stable | svn fteqcc | git://github.com/Blub/qclib.git | master | -div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master | +div0-gittools | | master | netradiant | | master | " # todo: in darkplaces, change repobranch to div0-stable diff --git a/misc/tools/WeaponEncounterProfile.pm b/misc/tools/WeaponEncounterProfile.pm index 52766ea1..68acfb23 100644 --- a/misc/tools/WeaponEncounterProfile.pm +++ b/misc/tools/WeaponEncounterProfile.pm @@ -114,6 +114,7 @@ our %WeaponMap = ( 14 => ["Tuba", "tuba"], 15 => ["Camping Rifle", "campingrifle"], 16 => ["Fireball", "fireball"], + 17 => ["Seeker", "seeker"], ); sub weaponid_valid($$)