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 55f356e..dbb26f3 master -> origin/master 1e64b07..1420eec sdl2 -> origin/sdl2 Updating 55f356e..dbb26f3 Fast-forward src/enet/ChangeLog | 2 + src/enet/check_cflags.sh | 2 + src/enet/unix.c | 79 +++++++++++++++++++++---- src/engine/physics.cpp | 11 ++-- src/engine/renderva.cpp | 2 +- src/fpsgame/client.cpp | 19 +++--- src/fpsgame/game.h | 1 + src/fpsgame/monster.cpp | 2 +- src/fpsgame/server.cpp | 2 +- src/include/openssl/bn.h | 5 ++ src/include/openssl/e_os2.h | 8 ++- src/include/openssl/ec.h | 11 ++-- src/include/openssl/evp.h | 17 +++++- src/include/openssl/opensslconf.h | 19 +++--- src/include/openssl/opensslv.h | 6 +- src/include/openssl/ssl.h | 5 ++ src/include/openssl/x509_vfy.h | 6 ++ src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libcrypto.a | Bin 8886192 -> 8903200 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1765600 -> 1773072 bytes src/lib/darwin/native/libcrypto.a | Bin 6127480 -> 6142224 bytes src/lib/darwin/native/libssl.a | Bin 1010976 -> 1017112 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4628284 -> 4635500 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 880740 -> 884320 bytes src/lib/freebsd/amd64/native/libcrypto.a | Bin 4524442 -> 4540078 bytes src/lib/freebsd/amd64/native/libssl.a | Bin 692052 -> 696080 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 12902438 -> 12919150 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 3856436 -> 3872248 bytes src/lib/linux/i686/native/libcrypto.a | Bin 3002018 -> 3007610 bytes src/lib/linux/i686/native/libssl.a | Bin 521728 -> 525464 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4549260 -> 4556772 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 879572 -> 883196 bytes src/lib/linux/x86_64/native/libcrypto.a | Bin 4462790 -> 4475218 bytes src/lib/linux/x86_64/native/libssl.a | Bin 686924 -> 690888 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 4015806 -> 4021008 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 852016 -> 855846 bytes src/lib/win/i686/native/libcrypto.a | Bin 2632024 -> 2640742 bytes src/lib/win/i686/native/libssl.a | Bin 467368 -> 470026 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4692976 -> 4700264 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 882900 -> 886496 bytes src/lib/win/x86_64/native/libcrypto.a | Bin 3361946 -> 3372092 bytes src/lib/win/x86_64/native/libssl.a | Bin 507146 -> 509958 bytes src/mod/extinfo.cpp | 4 +- src/scripts/lib-build-scripts/openssl/build.sh | 4 +- 44 files changed, 151 insertions(+), 56 deletions(-) Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 10 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 1e64b07..1420eec Fast-forward src/enet/ChangeLog | 2 + src/enet/check_cflags.sh | 2 + src/enet/unix.c | 79 +++++++++++++++++++++---- src/engine/physics.cpp | 11 ++-- src/engine/renderva.cpp | 2 +- src/fpsgame/client.cpp | 19 +++--- src/fpsgame/game.h | 1 + src/fpsgame/monster.cpp | 2 +- src/fpsgame/server.cpp | 2 +- src/include/openssl/bn.h | 5 ++ src/include/openssl/e_os2.h | 8 ++- src/include/openssl/ec.h | 11 ++-- src/include/openssl/evp.h | 17 +++++- src/include/openssl/opensslconf.h | 19 +++--- src/include/openssl/opensslv.h | 6 +- src/include/openssl/ssl.h | 5 ++ src/include/openssl/x509_vfy.h | 6 ++ src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libcrypto.a | Bin 8886192 -> 8903200 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1765600 -> 1773072 bytes src/lib/darwin/native/libcrypto.a | Bin 6127480 -> 6142224 bytes src/lib/darwin/native/libssl.a | Bin 1010976 -> 1017112 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4628284 -> 4635500 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 880740 -> 884320 bytes src/lib/freebsd/amd64/native/libcrypto.a | Bin 4524442 -> 4540078 bytes src/lib/freebsd/amd64/native/libssl.a | Bin 692052 -> 696080 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 12902438 -> 12919150 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 3856436 -> 3872248 bytes src/lib/linux/i686/native/libcrypto.a | Bin 3002018 -> 3007610 bytes src/lib/linux/i686/native/libssl.a | Bin 521728 -> 525464 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4549260 -> 4556772 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 879572 -> 883196 bytes src/lib/linux/x86_64/native/libcrypto.a | Bin 4462790 -> 4475218 bytes src/lib/linux/x86_64/native/libssl.a | Bin 686924 -> 690888 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 4015806 -> 4021008 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 852016 -> 855846 bytes src/lib/win/i686/native/libcrypto.a | Bin 2632024 -> 2640742 bytes src/lib/win/i686/native/libssl.a | Bin 467368 -> 470026 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4692976 -> 4700264 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 882900 -> 886496 bytes src/lib/win/x86_64/native/libcrypto.a | Bin 3361946 -> 3372092 bytes src/lib/win/x86_64/native/libssl.a | Bin 507146 -> 509958 bytes src/mod/extinfo.cpp | 4 +- src/scripts/lib-build-scripts/openssl/build.sh | 4 +- 44 files changed, 151 insertions(+), 56 deletions(-)