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

diff --combined all
index a953d1a235a5428398603491f40f81cdda51b96c,9fbae729128c37c7a507145f1ca7af87c9cd11ab..cca966437184ca277c8ba0933bd5df0212f4dddd
--- 1/all
--- 2/all
+++ b/all
@@@ -663,6 -663,9 +663,9 @@@ case "$cmd" i
                                        ;;
                        esac
                fi
+               if [ -n "$checkoutflags" ]; then
+                       set -- -f "$@" # to make checkself work again
+               fi
                exists=false
                for d in $repos; do
                        enter "$d0/$d" verbose
@@@ -1378,7 -1381,6 +1381,6 @@@
                                msg "Unknown arg: $X"
                        fi
                        found=true
-                       shift
                done
                if ! $found; then
                        rmuntracked=true
@@@ -1547,7 -1549,7 +1549,7 @@@
                }
                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