From: Rudolf Polzer <divVerent@alientrap.org>
Date: Fri, 20 Aug 2010 12:23:54 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~63
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=5050382ea259ff33953768a43e9c341960e34c1d

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

5050382ea259ff33953768a43e9c341960e34c1d
diff --cc all
index 2bc1bf9b,3e120e5b..64a28e58
--- a/all
+++ b/all
@@@ -607,9 -593,9 +607,9 @@@ case "$cmd" i
  	run)
  		if [ -n "$WE_HATE_OUR_USERS" ]; then
  			client=
- 			export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 -			export PATH="$d0/misc/buildfiles/win32:$PATH"
++			export PATH="$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