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

diff --combined misc/tools/rebrand-darkplaces-engine.sh
index 19f05b12b094247fb3fc570e394a9e55ad25a402,3a987185de79589a387accec596eec8ae35c05fc..d1d9468df295843b884c7721903d6ab8bbc499cf
--- 1/misc/tools/rebrand-darkplaces-engine.sh
--- 2/misc/tools/rebrand-darkplaces-engine.sh
+++ b/misc/tools/rebrand-darkplaces-engine.sh
@@@ -13,7 -13,7 +13,7 @@@ icon_xpm=darkplaces.xp
  
  . "$1"; shift
  
- flags="$flags -customgamename \"$name\" -customgamedirname1 \"$dirname1\" -customgamedirname2 \"$dirname2\" -customgamescreenshotname \"$screenshotname\" -customuserdirname \"$userdirname\""
+ flags="$flags -customgamename \"$name\" -customgamedirname1 \"$dirname1\" -customgamedirname2 \"$dirname2\" -customgamescreenshotname \"$screenshotname\" -customgameuserdirname \"$userdirname\""
  echo "$flags" > darkplaces.opt
  
  for EXECUTABLE in "$@"; do
@@@ -57,31 -57,31 +57,31 @@@
                rm -f darkplaces-icon.xpm
        fi
  
 -      if $uses_ico; then
 -              e=$EXECUTABLE \
 -              i=$icon_ico \
 -              n=$name \
 -              perl <<'EOF'
 -              use strict;
 -              use warnings;
 -              use Win32::Exe;
 -
 -              my $n = $ENV{n};
 -              my $i = $ENV{i};
 -              my $e = $ENV{e};
 -
 -              my $exe = Win32::Exe->new($e)
 -                      or die "Win32::Exe->new: $!";
 -              $exe = $exe->create_resource_section()
 -                      unless $exe->has_resource_section();
 -              $exe->update(icon => $i);
 -              $exe->update(info => ["InternalName=$e"]);
 -              $exe->update(info => ["OriginalFilename=$e"]);
 -              $exe->update(info => ["ProductName=$n"]);
 -              $exe->write($e)
 -                      or die "Win32::Exe->write: $!";
 -EOF
 -      fi
 +#     if $uses_ico; then
 +#             e=$EXECUTABLE \
 +#             i=$icon_ico \
 +#             n=$name \
 +#             perl <<'EOF'
 +#             use strict;
 +#             use warnings;
 +#             use Win32::Exe;
 +#
 +#             my $n = $ENV{n};
 +#             my $i = $ENV{i};
 +#             my $e = $ENV{e};
 +#
 +#             my $exe = Win32::Exe->new($e)
 +#                     or die "Win32::Exe->new: $!";
 +#             $exe = $exe->create_resource_section()
 +#                     unless $exe->has_resource_section();
 +#             $exe->update(icon => $i);
 +#             $exe->update(info => ["InternalName=$e"]);
 +#             $exe->update(info => ["OriginalFilename=$e"]);
 +#             $exe->update(info => ["ProductName=$n"]);
 +#             $exe->write($e)
 +#                     or die "Win32::Exe->write: $!";
 +#EOF
 +#     fi
  
        if $uses_icns; then
                # OS X is special here