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

diff --git a/all b/all
index ce7cdbde86a0d9f54cf8407e07390e51eb36337a..9af8ea859741bffffc93119192d3051d374bdb93 100755 (executable)
--- a/all
+++ b/all
@@ -312,7 +312,7 @@ fix_git_config()
        if [ -z "`git config push.default || true`" ]; then
                verbose git config push.default current # or is tracking better?
        fi
-       verbose git config filter.mapclean.clean "grep ^[^/]"
+       verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'"
        verbose git config filter.mapclean.smudge "cat"
 }