From: terencehill <piuntn@gmail.com>
Date: Sat, 4 Dec 2010 19:11:03 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/crosshair_colors
X-Git-Tag: xonotic-v0.1.0preview~73^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cdf8d22631c0acdf97bd69bdd00ab86e96b30b73;hp=a09ff43560675812e506d6d425c6dd829911b990

Merge branch 'master' into terencehill/crosshair_colors
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index b0f011ee72..6a31b99ad5 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -100,8 +100,7 @@ seta crosshair_dot_color "1 0 0" "when != 0, use custom color for the crosshair
 seta crosshair_pickup 0.25
 seta crosshair_pickup_speed 4
 seta crosshair_per_weapon 0	"when 1, each gun will display a different crosshair"
-seta crosshair_color_override 0	"when 1, crosshair_color_* overrides the per-weapon color"
-seta crosshair_color_per_weapon 1 "when 1, each gun will display a different colored crosshair"
+seta crosshair_color_per_weapon 1 "when 1, each gun will display the crosshair with a different color"
 seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
 seta crosshair_effect_scalefade 1 "use scaling and fading for crosshair effects"
 seta crosshair_hittest 1 "do a crosshair hit evaluation; also, the crosshair is scaled by the given number when aiming at an enemy, and blurred when aiming at a team mate"