From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 25 Sep 2010 08:16:25 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~24
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f29b3346e03acc33131aee38ff7abeba6641ef5d

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

f29b3346e03acc33131aee38ff7abeba6641ef5d
diff --cc all
index ffb77697,39b3b405..593e0b2e
--- a/all
+++ b/all
@@@ -111,15 -111,14 +111,15 @@@ enter(
  repos_urls="
  .                             |                                                   | master      |
  data/xonotic-data.pk3dir      |                                                   | master      |
- data/xonotic-maps.pk3dir      |                                                   | master      |
  data/xonotic-music.pk3dir     |                                                   | master      |
  data/xonotic-nexcompat.pk3dir |                                                   | master      | no
- mediasource                   |                                                   | master      | no
  darkplaces                    |                                                   | div0-stable | svn
- fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
- div0-gittools                 |                                                   | master      | no
  netradiant                    |                                                   | master      |
+ div0-gittools                 |                                                   | master      | no
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
+ data/xonotic-maps.pk3dir      |                                                   | master      |
+ mediasource                   |                                                   | master      | no
+ fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -1166,13 -1147,9 +1163,9 @@@ case "$cmd" i
  			'' '' \
  			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
  		;;
- 	release-engine-osx)
- 		verbose "$SELF" release-engine-osx-sv-sdl
- 		verbose "$SELF" release-engine-osx-agl
- 		;;
  	release-engine-linux32)
  		verbose "$SELF" release-compile linux32 \
 -			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
 +			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
  			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
  			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
  		;;