From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 26 Jul 2010 12:34:39 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~83
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8640529781a776fc2784c1b66de270d2d2375e8e

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

8640529781a776fc2784c1b66de270d2d2375e8e
diff --cc all
index f841911a,2906d8a0..e1c7780e
--- a/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