From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 2 Sep 2010 10:30:19 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~53
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=53277300e7356ea6265e48a087cd2a234c962a14;hp=--cc

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

53277300e7356ea6265e48a087cd2a234c962a14
diff --cc all
index f22a8b72,6b417991..fb15fb02
--- a/all
+++ b/all
@@@ -550,18 -548,10 +550,11 @@@ case "$cmd" i
  				cleanqc=true
  				shift
  				;;
- 			-n)
- 				cleand0=false
- 				cleandp=false
- 				cleanqcc=false
- 				cleanqc=false
- 				shift
- 				;;
  			*)
 +				cleand0=false
  				cleandp=false
  				cleanqcc=false
- 				cleanqc=true # version info
+ 				cleanqc=false
  				;;
  		esac
  		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then