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/vcpp/mingw.res From github.com:tpoechtrager/wc-ng 41d1ffe..019e34b master -> origin/master 917fd28..611f6ce sdl2 -> origin/sdl2 Updating 41d1ffe..019e34b Fast-forward ChangeLog | 2 +- src/Makefile | 1 + src/engine/bih.cpp | 4 +-- src/engine/cubeloader.cpp | 2 -- src/engine/material.cpp | 12 +++---- src/engine/octa.h | 7 +--- src/engine/physics.cpp | 8 ++--- src/engine/renderva.cpp | 18 +++++------ src/engine/sound.cpp | 8 ++--- src/engine/world.cpp | 8 ++--- src/engine/worldio.cpp | 2 -- src/fpsgame/ai.cpp | 4 +-- src/fpsgame/client.cpp | 8 ----- src/fpsgame/entities.cpp | 26 +++++++-------- src/include/GeoIP/GeoIP.h | 52 ++++++++++++++++-------------- src/include/GeoIP/GeoIPCity.h | 23 ++++++------- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 681792 -> 711632 bytes src/lib/darwin/native/libGeoIP.a | Bin 624816 -> 650152 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 343862 -> 359034 bytes src/lib/freebsd/amd64/native/libGeoIP.a | Bin 438774 -> 442198 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 408734 -> 420854 bytes src/lib/linux/i686/native/libGeoIP.a | Bin 462262 -> 465546 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 411042 -> 425190 bytes src/lib/linux/x86_64/native/libGeoIP.a | Bin 553678 -> 549958 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 338974 -> 351944 bytes src/lib/win/i686/native/libGeoIP.a | Bin 298576 -> 300514 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 341570 -> 356794 bytes src/lib/win/x86_64/native/libGeoIP.a | Bin 318294 -> 320306 bytes src/mod/hwdisplay.cpp | 6 ++-- src/mod/plugin.cpp | 4 --- src/scripts/menu/config/hwtemp.cfg | 42 ++++++++++++++++++++++++ src/scripts/menu/config/main.cfg | 3 ++ src/scripts/menu/config/wcmenu.cfg | 3 +- src/shared/ents.h | 29 +++++++++++------ src/shared/geom.h | 2 +- src/shared/tools.h | 6 ++-- 37 files changed, 160 insertions(+), 122 deletions(-) create mode 100644 src/scripts/menu/config/hwtemp.cfg Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 12 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/vcpp/mingw.res From github.com:tpoechtrager/wc-ng * branch sdl2 -> FETCH_HEAD Updating 917fd28..611f6ce Fast-forward ChangeLog | 2 +- src/Makefile | 3 +- src/engine/bih.cpp | 4 +-- src/engine/cubeloader.cpp | 2 -- src/engine/material.cpp | 12 +++---- src/engine/octa.h | 7 +--- src/engine/physics.cpp | 8 ++--- src/engine/renderva.cpp | 18 +++++------ src/engine/sound.cpp | 8 ++--- src/engine/world.cpp | 8 ++--- src/engine/worldio.cpp | 2 -- src/fpsgame/ai.cpp | 4 +-- src/fpsgame/client.cpp | 8 ----- src/fpsgame/entities.cpp | 26 +++++++-------- src/include/GeoIP/GeoIP.h | 52 ++++++++++++++++-------------- src/include/GeoIP/GeoIPCity.h | 23 ++++++------- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libGeoIP.a | Bin 681792 -> 711632 bytes src/lib/darwin/native/libGeoIP.a | Bin 624816 -> 650152 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 343862 -> 359034 bytes src/lib/freebsd/amd64/native/libGeoIP.a | Bin 438774 -> 442198 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 408734 -> 420854 bytes src/lib/linux/i686/native/libGeoIP.a | Bin 462262 -> 465546 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 411042 -> 425190 bytes src/lib/linux/x86_64/native/libGeoIP.a | Bin 553678 -> 549958 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 338974 -> 351944 bytes src/lib/win/i686/native/libGeoIP.a | Bin 298576 -> 300514 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 341570 -> 356794 bytes src/lib/win/x86_64/native/libGeoIP.a | Bin 318294 -> 320306 bytes src/mod/hwdisplay.cpp | 6 ++-- src/mod/plugin.cpp | 4 --- src/scripts/menu/config/hwtemp.cfg | 42 ++++++++++++++++++++++++ src/scripts/menu/config/main.cfg | 3 ++ src/scripts/menu/config/wcmenu.cfg | 3 +- src/shared/ents.h | 29 +++++++++++------ src/shared/geom.h | 2 +- src/shared/tools.h | 6 ++-- 37 files changed, 160 insertions(+), 124 deletions(-) create mode 100644 src/scripts/menu/config/hwtemp.cfg