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 1ee4bd3..ced52ae master -> origin/master 3a5b170..610ea91 sdl2 -> origin/sdl2 Updating 1ee4bd3..ced52ae Fast-forward ChangeLog | 6 +++- src/fpsgame/client.cpp | 5 +-- src/fpsgame/scoreboard.cpp | 6 ++-- src/mod/extinfo-playerpreview.cpp | 3 +- src/mod/extinfo.cpp | 68 ++++++++++++++++++++++++++++++++++++--- src/mod/extinfo.h | 32 ++++++++++++------ src/mod/gamemod.cpp | 38 ---------------------- src/mod/gamemod.h | 6 ---- src/mod/geoip.cpp | 54 +++++++++++++++++++++++-------- src/mod/geoip.h | 5 ++- src/mod/wcversion.h.in | 2 +- 11 files changed, 145 insertions(+), 80 deletions(-) Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 9 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 3a5b170..610ea91 Fast-forward ChangeLog | 6 +++- src/fpsgame/client.cpp | 5 +-- src/fpsgame/scoreboard.cpp | 6 ++-- src/fpsgame/weapon.cpp | 5 ++- src/mod/extinfo-playerpreview.cpp | 3 +- src/mod/extinfo.cpp | 68 ++++++++++++++++++++++++++++++++++++--- src/mod/extinfo.h | 32 ++++++++++++------ src/mod/gamemod.cpp | 38 ---------------------- src/mod/gamemod.h | 6 ---- src/mod/geoip.cpp | 54 +++++++++++++++++++++++-------- src/mod/geoip.h | 5 ++- src/mod/wcversion.h.in | 2 +- 12 files changed, 147 insertions(+), 83 deletions(-)