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

diff --combined all
index ff6211fc3f8f6ca6a30a4685e348239a280f1626,f164928cc79a75df3e79f3750aec7aafc8706577..c062d95684653c1a63a93d5f63d1b403c71da1c7
--- 1/all
--- 2/all
+++ b/all
@@@ -56,6 -56,7 +56,7 @@@ case "$cmd" i
                                                ;;
                                esac
                                verbose git pull
+                               verbose git remote prune origin
                                cd "$d0"
                        else
                                verbose git clone "$url" "$d0/$d"
@@@ -184,8 -185,7 +185,8 @@@
                                exit 1
                        fi
                fi
 -              verbose "darkplaces/darkplaces$client" -xonotic $@
 +              #verbose "darkplaces/darkplaces$client" -xonotic "$@"
 +              verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
                ;;
        each|foreach)
                for d in $repos; do