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

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 7d59ac4a0d0d919aca36460e357326ddc8f60c4f..c87a34661fb624263d6a8568136e6cf445bb1329 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -284,7 +284,7 @@ seta sv_defaultplayermodel_pink "" "\"\" means see sv_defaultplayermodel"
 seta sv_defaultplayerskin_pink 0
 seta sv_defaultplayercolors "" "set to 16*shirt+pants to force a color, note: it does NOT depend on defaultcharacter! Set to \"\" to disable"
 set sv_autoscreenshot 0 "if set to 1, the server forces all clients to create a local screenshot once the map ended"
-net_messagetimeout 300
+net_messagetimeout 30
 net_connecttimeout 30
 sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
 set ekg 0      "Throw huge amounts of gibs"