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

diff --git a/all b/all
index e5674a9e21e5894b3c5b792388124a6c7c0d35c2..35f09f9d2e3aa1aa8c73d727c2503a953511b3c9 100755 (executable)
--- a/all
+++ b/all
@@ -310,7 +310,7 @@ fix_git_config()
        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
        case ",`repoflags "$d"`," in
                *,noautocrlf,*)
-                       verbose git config --unset core.autocrlf
+                       verbose git config --unset core.autocrlf || true
                        ;;
                *)
                        verbose git config core.autocrlf input