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

diff --combined all
index 8a48f83e400ef9c25ff7cea6d19e365b800071e4,9ecb1763a25b5ea8a32cf4780f009de6b4017c72..8b3806e4201e4f2eea742b4737774d351006d18f
--- 1/all
--- 2/all
+++ b/all
@@@ -1611,7 -1611,7 +1611,7 @@@ case "$cmd" i
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
                        verbose rm -rf misc/builddeps
-                       verbose mv misc/buildfiles/win32/* . || true
+                       verbose mv misc/buildfiles/win32 bin32 || true
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
@@@ -1936,7 -1936,7 +1936,7 @@@
                fi
                # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
 -                      Xonotic/*.dll \
 +                      Xonotic/bin32/*.dll \
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \