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

all

data/.gitignore

misc/tools/cached-converter.sh

misc/tools/midi2cfg/foo180.mid

misc/tools/midi2cfg/foo180.rg

misc/tools/midi2cfg/foo180.sh

misc/tools/rsync-updater/update-xonotic.bat

misc/tools/rsync-updater/update-xonotic.sh

misc/tools/the-big-benchmark/the-big-benchmark.bat

misc/tools/the-big-benchmark/the-big-benchmark.sh

misc/tools/xonotic-map-compiler

misc/tools/xonotic-map-compiler-autobuild

misc/tools/xonotic-map-screenshot

server/rcon2irc/rcon2irc.pl

server/server.cfg

the-big-benchmark.sh