Merge branch 'master' into divVerent/crypto2

Conflicts:
	all

diff --cc all
index f841911a6cec2c635ab47101f1dc6a2c4112abd0,2906d8a002cde46c6ce069ffeb08dbb788ea04d7..e1c7780e41246e9d7d673bf6aec82842ecbe6433
--- 1/all
--- 2/all
+++ b/all
@@@ -553,9 -539,9 +553,9 @@@ case "$cmd" i
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/w32:$d0/d0_blind_id/.libs/$PATH"
 -                      export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
++                      export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
 -                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 +                      export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else