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 Already on 'master' Your branch is up-to-date with 'origin/master'. Already on 'master' Your branch is up-to-date with 'origin/master'. From github.com:tpoechtrager/wc-ng 15418f9..55f356e master -> origin/master 6bfda02..1e64b07 sdl2 -> origin/sdl2 Updating 15418f9..55f356e Fast-forward merge_with_sauer_svn.sh | 6 +- src/{build.sh => build_clang.sh} | 13 +- src/build_clang_lto.sh | 1 + src/build_gcc.sh | 1 + src/build_gcc_lto.sh | 1 + src/build_lto.sh | 1 - src/enet/ChangeLog | 6 + src/enet/LICENSE | 2 +- src/enet/include/enet/enet.h | 2 +- src/enet/protocol.c | 10 +- src/enet/unix.c | 6 +- src/enet/win32.c | 3 +- src/engine/command.cpp | 10 +- src/engine/octa.cpp | 1 + src/engine/skelmodel.h | 1 + src/fpsgame/scoreboard.cpp | 2 +- src/include/curl/curl.h | 14 +- src/include/curl/curlrules.h | 24 -- src/include/curl/curlver.h | 10 +- src/include/curl/mprintf.h | 9 +- src/include/openssl/asn1.h | 10 +- src/include/openssl/bio.h | 8 +- src/include/openssl/bn.h | 18 -- src/include/openssl/buffer.h | 1 + src/include/openssl/cms.h | 52 ++- src/include/openssl/dh.h | 105 ++++++ src/include/openssl/dsa.h | 3 + src/include/openssl/dtls1.h | 6 +- src/include/openssl/e_os2.h | 2 +- src/include/openssl/ec.h | 90 +++++- src/include/openssl/ecdh.h | 7 + src/include/openssl/ecdsa.h | 75 +++++ src/include/openssl/engine.h | 1 - src/include/openssl/evp.h | 43 ++- src/include/openssl/modes.h | 10 + src/include/openssl/obj_mac.h | 163 ++++++++++ src/include/openssl/ocsp.h | 17 +- src/include/openssl/opensslconf.h | 31 +- src/include/openssl/opensslv.h | 6 +- src/include/openssl/ossl_typ.h | 2 + src/include/openssl/pem.h | 12 +- src/include/openssl/rsa.h | 58 +++- src/include/openssl/safestack.h | 148 ++++++++- src/include/openssl/srtp.h | 1 - src/include/openssl/ssl.h | 421 ++++++++++++++++++++++++- src/include/openssl/ssl3.h | 62 +++- src/include/openssl/stack.h | 1 + src/include/openssl/symhacks.h | 34 +- src/include/openssl/tls1.h | 41 ++- src/include/openssl/x509.h | 26 ++ src/include/openssl/x509_vfy.h | 52 +++ src/include/openssl/x509v3.h | 44 ++- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libcrypto.a | Bin 8182088 -> 8886192 bytes src/lib/darwin/llvm-lto/libcurl.a | Bin 2559600 -> 2560320 bytes src/lib/darwin/llvm-lto/libpng16.a | Bin 1097824 -> 1058528 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1625488 -> 1765600 bytes src/lib/darwin/native/libcrypto.a | Bin 5536064 -> 6127480 bytes src/lib/darwin/native/libcurl.a | Bin 1141768 -> 1123952 bytes src/lib/darwin/native/libpng16.a | Bin 539496 -> 536544 bytes src/lib/darwin/native/libssl.a | Bin 936584 -> 1010976 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4096418 -> 4628284 bytes src/lib/freebsd/amd64/llvm-lto/libcurl.a | Bin 1299458 -> 1293242 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 550278 -> 522266 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 809402 -> 880740 bytes src/lib/freebsd/amd64/native/libcrypto.a | Bin 4024518 -> 4524442 bytes src/lib/freebsd/amd64/native/libcurl.a | Bin 801838 -> 795694 bytes src/lib/freebsd/amd64/native/libpng16.a | Bin 346998 -> 343038 bytes src/lib/freebsd/amd64/native/libssl.a | Bin 642150 -> 692052 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 12466052 -> 12902438 bytes src/lib/linux/i686/llvm-lto/libcurl.a | Bin 1253642 -> 1252814 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 477506 -> 477502 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 3535654 -> 3856436 bytes src/lib/linux/i686/native/libcrypto.a | Bin 2903912 -> 3002018 bytes src/lib/linux/i686/native/libcurl.a | Bin 738966 -> 602634 bytes src/lib/linux/i686/native/libpng16.a | Bin 306820 -> 265510 bytes src/lib/linux/i686/native/libssl.a | Bin 487522 -> 521728 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4017998 -> 4549260 bytes src/lib/linux/x86_64/llvm-lto/libcurl.a | Bin 1292346 -> 1286326 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 548138 -> 520130 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 807986 -> 879572 bytes src/lib/linux/x86_64/native/libcrypto.a | Bin 3964714 -> 4462790 bytes src/lib/linux/x86_64/native/libcurl.a | Bin 833122 -> 783042 bytes src/lib/linux/x86_64/native/libpng16.a | Bin 321014 -> 340278 bytes src/lib/linux/x86_64/native/libssl.a | Bin 637638 -> 686924 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 3753134 -> 4015806 bytes src/lib/win/i686/llvm-lto/libcurl.a | Bin 1210160 -> 1199854 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 469080 -> 478684 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 774576 -> 852016 bytes src/lib/win/i686/native/libcrypto.a | Bin 2502012 -> 2632024 bytes src/lib/win/i686/native/libcurl.a | Bin 505694 -> 509918 bytes src/lib/win/i686/native/libpng16.a | Bin 222796 -> 245384 bytes src/lib/win/i686/native/libssl.a | Bin 434486 -> 467368 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4054674 -> 4692976 bytes src/lib/win/x86_64/llvm-lto/libcurl.a | Bin 1228540 -> 1214078 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 540732 -> 521958 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 800888 -> 882900 bytes src/lib/win/x86_64/native/libcrypto.a | Bin 2885380 -> 3361946 bytes src/lib/win/x86_64/native/libcurl.a | Bin 570422 -> 526854 bytes src/lib/win/x86_64/native/libpng16.a | Bin 246722 -> 272852 bytes src/lib/win/x86_64/native/libssl.a | Bin 468430 -> 507146 bytes src/mod/extinfo.cpp | 5 +- src/mod/playerdisplay.cpp | 15 +- src/mod/proxy-detection.cpp | 2 + src/scripts/lib-build-scripts/curl/build.sh | 4 +- src/scripts/lib-build-scripts/openssl/build.sh | 4 +- src/scripts/lib-build-scripts/sdl-1.2/build.sh | 9 +- src/scripts/menu/config/extinfo.cfg | 32 +- src/scripts/menu/config/wcmenu.cfg | 1 + src/shared/tools.h | 28 +- 110 files changed, 1589 insertions(+), 186 deletions(-) rename src/{build.sh => build_clang.sh} (88%) create mode 120000 src/build_clang_lto.sh create mode 120000 src/build_gcc.sh create mode 120000 src/build_gcc_lto.sh delete mode 120000 src/build_lto.sh Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 17 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 6bfda02..1e64b07 Fast-forward merge_with_sauer_svn.sh | 6 +- src/{build.sh => build_clang.sh} | 13 +- src/build_clang_lto.sh | 1 + src/build_gcc.sh | 1 + src/build_gcc_lto.sh | 1 + src/build_lto.sh | 1 - src/enet/ChangeLog | 6 + src/enet/LICENSE | 2 +- src/enet/include/enet/enet.h | 2 +- src/enet/protocol.c | 10 +- src/enet/unix.c | 6 +- src/enet/win32.c | 3 +- src/engine/command.cpp | 10 +- src/engine/octa.cpp | 1 + src/engine/skelmodel.h | 1 + src/fpsgame/scoreboard.cpp | 2 +- src/include/curl/curl.h | 14 +- src/include/curl/curlrules.h | 24 -- src/include/curl/curlver.h | 10 +- src/include/curl/mprintf.h | 9 +- src/include/openssl/asn1.h | 10 +- src/include/openssl/bio.h | 8 +- src/include/openssl/bn.h | 18 -- src/include/openssl/buffer.h | 1 + src/include/openssl/cms.h | 52 ++- src/include/openssl/dh.h | 105 ++++++ src/include/openssl/dsa.h | 3 + src/include/openssl/dtls1.h | 6 +- src/include/openssl/e_os2.h | 2 +- src/include/openssl/ec.h | 90 +++++- src/include/openssl/ecdh.h | 7 + src/include/openssl/ecdsa.h | 75 +++++ src/include/openssl/engine.h | 1 - src/include/openssl/evp.h | 43 ++- src/include/openssl/modes.h | 10 + src/include/openssl/obj_mac.h | 163 ++++++++++ src/include/openssl/ocsp.h | 17 +- src/include/openssl/opensslconf.h | 31 +- src/include/openssl/opensslv.h | 6 +- src/include/openssl/ossl_typ.h | 2 + src/include/openssl/pem.h | 12 +- src/include/openssl/rsa.h | 58 +++- src/include/openssl/safestack.h | 148 ++++++++- src/include/openssl/srtp.h | 1 - src/include/openssl/ssl.h | 421 ++++++++++++++++++++++++- src/include/openssl/ssl3.h | 62 +++- src/include/openssl/stack.h | 1 + src/include/openssl/symhacks.h | 34 +- src/include/openssl/tls1.h | 41 ++- src/include/openssl/x509.h | 26 ++ src/include/openssl/x509_vfy.h | 52 +++ src/include/openssl/x509v3.h | 44 ++- src/last_sauer_svn_rev.h | 2 +- src/lib/darwin/llvm-lto/libcrypto.a | Bin 8182088 -> 8886192 bytes src/lib/darwin/llvm-lto/libcurl.a | Bin 2559600 -> 2560320 bytes src/lib/darwin/llvm-lto/libpng16.a | Bin 1097824 -> 1058528 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1625488 -> 1765600 bytes src/lib/darwin/native/libcrypto.a | Bin 5536064 -> 6127480 bytes src/lib/darwin/native/libcurl.a | Bin 1141768 -> 1123952 bytes src/lib/darwin/native/libpng16.a | Bin 539496 -> 536544 bytes src/lib/darwin/native/libssl.a | Bin 936584 -> 1010976 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4096418 -> 4628284 bytes src/lib/freebsd/amd64/llvm-lto/libcurl.a | Bin 1299458 -> 1293242 bytes src/lib/freebsd/amd64/llvm-lto/libpng16.a | Bin 550278 -> 522266 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 809402 -> 880740 bytes src/lib/freebsd/amd64/native/libcrypto.a | Bin 4024518 -> 4524442 bytes src/lib/freebsd/amd64/native/libcurl.a | Bin 801838 -> 795694 bytes src/lib/freebsd/amd64/native/libpng16.a | Bin 346998 -> 343038 bytes src/lib/freebsd/amd64/native/libssl.a | Bin 642150 -> 692052 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 12466052 -> 12902438 bytes src/lib/linux/i686/llvm-lto/libcurl.a | Bin 1253642 -> 1252814 bytes src/lib/linux/i686/llvm-lto/libpng16.a | Bin 477506 -> 477502 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 3535654 -> 3856436 bytes src/lib/linux/i686/native/libcrypto.a | Bin 2903912 -> 3002018 bytes src/lib/linux/i686/native/libcurl.a | Bin 738966 -> 602634 bytes src/lib/linux/i686/native/libpng16.a | Bin 306820 -> 265510 bytes src/lib/linux/i686/native/libssl.a | Bin 487522 -> 521728 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4017998 -> 4549260 bytes src/lib/linux/x86_64/llvm-lto/libcurl.a | Bin 1292346 -> 1286326 bytes src/lib/linux/x86_64/llvm-lto/libpng16.a | Bin 548138 -> 520130 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 807986 -> 879572 bytes src/lib/linux/x86_64/native/libcrypto.a | Bin 3964714 -> 4462790 bytes src/lib/linux/x86_64/native/libcurl.a | Bin 833122 -> 783042 bytes src/lib/linux/x86_64/native/libpng16.a | Bin 321014 -> 340278 bytes src/lib/linux/x86_64/native/libssl.a | Bin 637638 -> 686924 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 3753134 -> 4015806 bytes src/lib/win/i686/llvm-lto/libcurl.a | Bin 1210160 -> 1199854 bytes src/lib/win/i686/llvm-lto/libpng16.a | Bin 469080 -> 478684 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 774576 -> 852016 bytes src/lib/win/i686/native/libcrypto.a | Bin 2502012 -> 2632024 bytes src/lib/win/i686/native/libcurl.a | Bin 505694 -> 509918 bytes src/lib/win/i686/native/libpng16.a | Bin 222796 -> 245384 bytes src/lib/win/i686/native/libssl.a | Bin 434486 -> 467368 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4054674 -> 4692976 bytes src/lib/win/x86_64/llvm-lto/libcurl.a | Bin 1228540 -> 1214078 bytes src/lib/win/x86_64/llvm-lto/libpng16.a | Bin 540732 -> 521958 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 800888 -> 882900 bytes src/lib/win/x86_64/native/libcrypto.a | Bin 2885380 -> 3361946 bytes src/lib/win/x86_64/native/libcurl.a | Bin 570422 -> 526854 bytes src/lib/win/x86_64/native/libpng16.a | Bin 246722 -> 272852 bytes src/lib/win/x86_64/native/libssl.a | Bin 468430 -> 507146 bytes src/mod/extinfo.cpp | 5 +- src/mod/playerdisplay.cpp | 15 +- src/mod/proxy-detection.cpp | 2 + src/scripts/lib-build-scripts/curl/build.sh | 4 +- src/scripts/lib-build-scripts/openssl/build.sh | 4 +- src/scripts/lib-build-scripts/sdl-1.2/build.sh | 9 +- src/scripts/menu/config/extinfo.cfg | 32 +- src/scripts/menu/config/wcmenu.cfg | 1 + src/shared/tools.h | 28 +- 110 files changed, 1589 insertions(+), 186 deletions(-) rename src/{build.sh => build_clang.sh} (88%) create mode 120000 src/build_clang_lto.sh create mode 120000 src/build_gcc.sh create mode 120000 src/build_gcc_lto.sh delete mode 120000 src/build_lto.sh