projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3647fb8
67a864d
)
Merge remote branch 'origin/master' into divVerent/crypto2
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:37:59 +0000
(07:37 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:37:59 +0000
(07:37 +0200)
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
index
fff4d56
,
317f775
..
2592fde
---
1
/
all
---
2
/
all
+++ b/
all
@@@
-1263,10
-1285,9
+1301,10
@@@
case "$cmd" i
Xonotic/misc \
Xonotic/fteqcc \
Xonotic/server \
+ 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 \
+ verbose
mkzip0
Xonotic-$stamp.zip \
Xonotic/data/xonotic-$stamp-data.pk3 \
Xonotic/data/xonotic-$stamp-maps.pk3 \
Xonotic/data/xonotic-$stamp-music.pk3 \