Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:02:00 +0000 (18:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Sep 2010 16:02:00 +0000 (18:02 +0200)
Conflicts:
all

1  2 
all

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