Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2011-03-08 21:56:52 +01:00
commit e654d98b21

9
all
View File

@ -359,7 +359,7 @@ mkzip()
mkzip0()
{
zip -0y "$@"
zip -0ry "$@"
}
mirrorspeed()
@ -1549,7 +1549,7 @@ case "$cmd" in
}
rm -f Xonotic/key_15.d0pk
{
verbose cd mapping
verbose cd Xonotic/mapping
verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
for X in *-7z.exe; do
@ -1902,8 +1902,9 @@ case "$cmd" in
Xonotic/data/xonotic-$stamp-maps-high.pk3 \
Xonotic/data/xonotic-$stamp-music.pk3 \
Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
verbose mkzip0 Xonotic-$stamp-mappingsuppport.zip \
Xonotic/mapping \
verbose mkzip Xonotic-$stamp-mappingsupport.zip \
Xonotic/mapping
verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \
Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
;;
release)