From: terencehill <piuntn@gmail.com>
Date: Wed, 14 Jun 2017 20:36:12 +0000 (+0200)
Subject: Merge branch 'master' into Mario/win64
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=8847a910725c23d50aac932f4830cef7a4b3ae1f;hp=c0cc5bb8303dd1f21a2a880d2191e3419168422a;p=xonotic%2Fxonotic.git

Merge branch 'master' into Mario/win64
---

diff --git a/all b/all
index dcc4c400..ca2a093c 100755
--- a/all
+++ b/all
@@ -26,6 +26,8 @@ case "$0" in
 	*/all)
 		export d0="$d00/${0%/all}"
 		;;
+	*/all.xonotic.sh)
+		;;
 	*)
 		$ECHO "Cannot find myself."
 		$ECHO "Please run this script with the working directory inside a Xonotic checkout."