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

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

2003f97c2a6ab97a9e51922726bc37208b2e12d1
diff --cc all
index bd561dde,b48fe356..55fba078
--- a/all
+++ b/all
@@@ -1227,10 -1233,6 +1249,7 @@@ case "$cmd" i
  			Xonotic/misc \
  			Xonotic/fteqcc \
  			Xonotic/server \
- 			Xonotic/*.app \
- 			Xonotic/xonotic-* \
- 			Xonotic/xonotic.exe \
 +			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 \