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

diff --combined all
index a99532076ae863f645e6e218b0d27b26848df8ef,92e63400ab973e30be8709e80c2e1ba967f1bd98..b229ae3d98cb99a95e570a6912cbf6f9bba31d21
--- 1/all
--- 2/all
+++ b/all
@@@ -1612,6 -1612,7 +1612,7 @@@ case "$cmd" i
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
                        verbose rm -rf misc/builddeps
                        verbose mv misc/buildfiles/win32 bin32 || true
+                       verbose mv bin32/SDL.dll . || true
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
@@@ -1847,21 -1848,11 +1848,21 @@@
                                        versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
 -                      verbose sed "
 -                              s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 -                              s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 -                              s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 -                      " < defaultXonotic.cfg > defaultXonotic.cfg.new
 +                      if [ $gv -lt 900 ]; then
 +                              # pre-1.0: compatible with any other pre-1.0
 +                              verbose sed "
 +                                      s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 +                                      s/^gameversion_min [0-9]*/gameversion_min     0/;
 +                                      s/^gameversion_max [0-9]*/gameversion_max  9999/;
 +                              " < defaultXonotic.cfg > defaultXonotic.cfg.new
 +                      else
 +                              # >= 1.0
 +                              verbose sed "
 +                                      s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 +                                      s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 +                                      s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 +                              " < defaultXonotic.cfg > defaultXonotic.cfg.new
 +                      fi
                        mv defaultXonotic.cfg.new defaultXonotic.cfg
                        case "$RELEASETYPE" in
                                release)