projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9991fcb
4baa56d
)
Merge branch 'master' into divVerent/crypto2
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:02:00 +0000
(18:02 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:02:00 +0000
(18:02 +0200)
Conflicts:
all
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
index bd561dde72a4ca59ef025b5719363aed50f15d00,b48fe356f12e0aacbaab5186ae9251323ad5e3b2..55fba078518c7ca5ac06294cd305625f0f0e9ee0
---
1
/
all
---
2
/
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 \