From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 3 Sep 2010 07:08:18 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~50
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=cb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6;hp=--cc

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

cb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6
diff --cc all
index fc3b969b,58e1ea40..bd561dde
--- a/all
+++ b/all
@@@ -945,8 -931,12 +945,12 @@@ case "$cmd" i
  		esac
  		verbose rm -rf Xonotic Xonotic*.zip
  		verbose mkdir -p Xonotic
- 		verbose date +%Y%m%d > Xonotic/stamp.txt
+ 		if [ -n "$RELEASEDATE" ]; then
+ 			verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+ 		else
+ 			verbose date +%Y%m%d > Xonotic/stamp.txt
+ 		fi
 -		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 +		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
  			verbose cd Xonotic
  			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
  			verbose tar xvf -