From: FruitieX <rasse@rasse-laptop.(none)>
Date: Wed, 13 Oct 2010 19:35:32 +0000 (+0300)
Subject: Merge branch 'master' into fruitiex/fruitbalance
X-Git-Tag: xonotic-v0.1.0preview~267^2~10^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=13ef1ff574dfa739e5c768d5dabaeed6dce7ad17;hp=c8a8df111823d8a9a5a8ea71296c11745d00fd1a

Merge branch 'master' into fruitiex/fruitbalance
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1de356f66a..97f94e02b2 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1942,7 +1942,7 @@ scr_conscroll3_y 0
 scr_conscroll_x -0.1
 scr_conscroll_y -0.3
 
-scr_loadingscreen_background 1
+scr_loadingscreen_background 0
 scr_loadingscreen_barcolor "0 0.5 1"
 scr_loadingscreen_barheight 20
 scr_loadingscreen_count 1