]> de.git.xonotic.org Git - xonotic/netradiant-xonoticpack.git/commitdiff
projects / xonotic / netradiant-xonoticpack.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 24b4cf6)
Merge branch 'master' of ssh://git.xonotic.org/netradiant-xonoticpack
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 1 Jul 2011 09:30:39 +0000 (11:30 +0200)
Conflicts:
games/xonotic.game

games/xonotic.game patch | blob | history

diff --git a/games/xonotic.game b/games/xonotic.game
index da987a078013286cb28c6fe113225432fbbf250d..8e3c56de36cb18a40d74dbc5b116d1be3c0709c2 100644 (file)
--- a/games/xonotic.game
+++ b/games/xonotic.game
@@ -26,7 +26,7 @@
   brushtypes="quake3"
   patchtypes="quake3"
   default_scale="0.25"
-  forbidden_paths="xonotic-rsync-nexcompat-high.pk3 xonotic-rsync-nexcompat.pk3 xonotic-nexcompat.pk3dir"
+  forbidden_paths="xonotic*-data*.pk3* xonotic*-nexcompat*.pk3*"
   q3map2_type="xonotic"
   brush_primit="1"
 />