From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 23 Dec 2011 22:37:29 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.6.0~74^2~66
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6247d490047631d05b4e1eba9590fcc1a8cce5aa;hp=aeceab8f2e2a8e14ee110fda0d400daa3536c802

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f269a424ac..d1b82b6756 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1949,6 +1949,9 @@ sv_gameplayfix_consistentplayerprethink 1
 // support Q1BSP maps
 mod_q1bsp_polygoncollisions 1
 
+// match q3map2
+mod_obj_orientation 0
+
 // improve some minor details
 sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1