From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 17 Sep 2010 05:37:59 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0241e4415badd2c570f6711ee605e51fc69c876a;p=xonotic%2Fxonotic.git

Merge remote branch 'origin/master' into divVerent/crypto2
---

0241e4415badd2c570f6711ee605e51fc69c876a
diff --cc all
index fff4d56e,317f7759..2592fde5
--- a/all
+++ b/all
@@@ -1263,10 -1285,9 +1301,10 @@@ case "$cmd" i
  			Xonotic/misc \
  			Xonotic/fteqcc \
  			Xonotic/server \
 +			Xonotic/key_0.d0pk \
  			Xonotic/data/font-nimbussansl-$stamp.pk3
  		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
- 		verbose zip -0yr Xonotic-$stamp.zip \
+ 		verbose mkzip0 Xonotic-$stamp.zip \
  			Xonotic/data/xonotic-$stamp-data.pk3 \
  			Xonotic/data/xonotic-$stamp-maps.pk3 \
  			Xonotic/data/xonotic-$stamp-music.pk3 \