Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:37:59 +0000 (07:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 05:37:59 +0000 (07:37 +0200)
1  2 
all

diff --cc all
--- 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 \