Switched to branch 'master' Your branch is up-to-date with 'origin/master'. Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng 87f0477..1ee4bd3 master -> origin/master bea81e7..3a5b170 sdl2 -> origin/sdl2 Updating 87f0477..1ee4bd3 Fast-forward BUILD_INSTRUCTIONS.md | 11 ++++++++ src/Makefile | 13 +++++++-- src/TODO | 1 + src/build/package_nsis_windows_mingw.sh | 12 +++++++-- src/fpsgame/weapon.cpp | 40 +++++++++++++++++++++++++--- src/mod/chat-ca-certs.h | 2 +- src/mod/chat.cpp | 2 +- src/mod/chat.h | 2 +- src/mod/chatserver/chatserver.cpp | 2 +- src/mod/chatserver/sfree.h | 2 +- src/mod/compat.h | 2 +- src/mod/compiler.h | 2 +- src/mod/crypto.cpp | 2 +- src/mod/crypto.h | 2 +- src/mod/cubescript.cpp | 2 +- src/mod/cubescript.h | 2 +- src/mod/demorecorder.cpp | 2 +- src/mod/demorecorder.h | 2 +- src/mod/events.cpp | 2 +- src/mod/events.h | 2 +- src/mod/extinfo-playerpreview.cpp | 23 +++++++++++++++- src/mod/extinfo.cpp | 2 +- src/mod/extinfo.h | 2 +- src/mod/gamemod.cpp | 2 +- src/mod/gamemod.h | 2 +- src/mod/geoip.cpp | 2 +- src/mod/geoip.h | 2 +- src/mod/http.cpp | 2 +- src/mod/http.h | 2 +- src/mod/hwdisplay.cpp | 2 +- src/mod/ipbuf.h | 2 +- src/mod/ipignore.cpp | 2 +- src/mod/ipignore.h | 2 +- src/mod/mod.cpp | 2 +- src/mod/mod.h | 2 +- src/mod/playerdisplay.cpp | 2 +- src/mod/plugin.cpp | 2 +- src/mod/plugin.h | 2 +- src/mod/quirks/glibc/compat.c | 2 +- src/mod/strtool.cpp | 2 +- src/mod/strtool.h | 2 +- src/mod/thread.h | 2 +- src/plugins/g15lcd/g15lcd.cpp | 2 +- src/plugins/g15lcd/g15sdkwrapper.h | 2 +- src/plugins/g15lcd/g15sdkwrapper_linux.cpp | 2 +- src/plugins/g15lcd/g15sdkwrapper_windows.cpp | 2 +- src/plugins/hwtemp/hwtemp.cpp | 2 +- src/plugins/hwtemp/hwtemp.h | 2 +- src/plugins/hwtemp/linux.cpp | 2 +- src/plugins/hwtemp/nvapi_wrapper_windows.cpp | 2 +- src/plugins/hwtemp/nvapi_wrapper_windows.h | 2 +- src/plugins/hwtemp/osx.cpp | 2 +- src/plugins/hwtemp/windows.cpp | 2 +- 53 files changed, 138 insertions(+), 56 deletions(-) Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 8 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Removing src/build/.cache/ Removing src/build/checklto/test Removing src/build/cpucount Removing src/build/ld Removing src/build/wcversion Removing src/mod/quirks/mingw-w64/strtok_r.o Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng * branch sdl2 -> FETCH_HEAD Updating bea81e7..3a5b170 Fast-forward BUILD_INSTRUCTIONS.md | 11 +++++ src/Makefile | 13 +++++- src/TODO | 1 + src/build/package_nsis_windows_mingw.sh | 12 ++++- src/fpsgame/weapon.cpp | 78 ++++++++++++++++++++------------- 5 files changed, 80 insertions(+), 35 deletions(-)