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

diff --git a/all b/all
index f164928cc79a75df3e79f3750aec7aafc8706577..c062d95684653c1a63a93d5f63d1b403c71da1c7 100755 (executable)
--- a/all
+++ b/all
@@ -185,7 +185,8 @@ case "$cmd" in
                                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