Merge commit 'origin/esteel/renames'

Conflicts:
	server/readme.txt

diff --git a/.gitignore b/.gitignore
index 57ee8e6c0b4e12032b8b881f239fe366b95beeb4..042cc4d10c5a2a5d355bfeb6b7aab4117e9837cb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 darkplaces
 fteqcc
+div0-gittools

diff --git a/Docs/htmlfiles/faq.aft b/Docs/htmlfiles/faq.aft
index fe09a8bb39ca966526d7d55ae39481b74e1ec548..f36fd2cfc406106d1d5c59f4db8e89999255abd5 100644 (file)
--- a/Docs/htmlfiles/faq.aft
+++ b/Docs/htmlfiles/faq.aft
@@ -24,8 +24,6 @@ Nexuiz/
 |-- data/
 |   |-- common-spog.pk3
 |   `-- data*.pk3
-|-- havoc/
-|   `-- data*.pk3
 |-- Nexuiz.app/
 |-- Nexuiz-SDL.app/
 |-- server/

diff --git a/all b/all
index 9689ba653b5df22af41becd0e0a08de6f94b9d43..2b1cd557c92a1072f9d13d47f2b5b52ec002d531 100755 (executable)
--- a/all
+++ b/all
@@ -16,7 +16,7 @@ checkself()
                if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
                        msg "Rerunning the requested operation to make sure."
                        export XONOTIC_FORBID_RERUN_ALL=1
-                       exec "$@"
+                       exec "$0" "$@"
                else
                        msg "Please try $0 update, and then retry your requested operation."
                        exit 1
@@ -39,6 +39,7 @@ repos_urls="
        data/xonotic-nexcompat.pk3dir
        darkplaces
        fteqcc@git://github.com/Blub/qclib.git
+       div0-gittools@git://git.icculus.org/divverent/div0-gittools.git
 "
 
 repos=`for X in $repos_urls; do echo "${X%%@*}"; done`