Merge branch 'master' into next

assets/CMakeLists.txt

bin/Resources/i686/exchndl.dll

bin/Resources/i686/fmod.dll

bin/Resources/i686/fmodex.dll

bin/Resources/i686/fmodexL.dll

bin/Resources/i686/libgcc_s_dw2-1.dll

bin/Resources/i686/libgme.dll

bin/Resources/i686/libintl-8.dll

bin/Resources/x86_64/fmod64.dll

bin/Resources/x86_64/fmodex64.dll

bin/Resources/x86_64/fmodexL64.dll

bin/Resources/x86_64/libgme.dll

debian/copyright

src/CMakeLists.txt

src/Makefile

src/am_map.c

src/am_map.h

src/asm_defs.inc

src/b_bot.c

src/b_bot.h