Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

diff --git a/all b/all
index 9fbae729128c37c7a507145f1ca7af87c9cd11ab..cca966437184ca277c8ba0933bd5df0212f4dddd 100755 (executable)
--- a/all
+++ b/all
@@ -1549,7 +1549,7 @@ case "$cmd" in
                }
                rm -f Xonotic/key_15.d0pk
                {
-                       verbose cd mapping
+                       verbose cd Xonotic/mapping
                        verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
                        verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
                        for X in *-7z.exe; do