projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7247fd0
0c1da75
)
Merge branch 'master' into divVerent/crypto2
author
Rudolf Polzer <divVerent@alientrap.org>
Thu, 2 Sep 2010 10:30:19 +0000
(12:30 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Thu, 2 Sep 2010 10:30:19 +0000
(12:30 +0200)
Conflicts:
all
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
index
f22a8b7
,
6b41799
..
fb15fb0
---
1
/
all
---
2
/
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