Already on '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/wcversion Removing src/vcpp/mingw.res From github.com:tpoechtrager/wc-ng c429629..da34e02 master -> origin/master 627a6a5..bb39a77 sdl2 -> origin/sdl2 Updating c429629..da34e02 Fast-forward src/TODO | 1 + src/fpsgame/fps.cpp | 3 ++- src/fpsgame/scoreboard.cpp | 17 ++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) Switched to branch 'sdl2' Your branch is behind 'origin/sdl2' by 6 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 Checking out files: 43% (28/65) Checking out files: 44% (29/65) Checking out files: 46% (30/65) Checking out files: 47% (31/65) Checking out files: 49% (32/65) Checking out files: 50% (33/65) Checking out files: 52% (34/65) Checking out files: 53% (35/65) Checking out files: 55% (36/65) Checking out files: 56% (37/65) Checking out files: 58% (38/65) Checking out files: 60% (39/65) Checking out files: 61% (40/65) Checking out files: 63% (41/65) Checking out files: 64% (42/65) Checking out files: 66% (43/65) Checking out files: 67% (44/65) Checking out files: 69% (45/65) Checking out files: 70% (46/65) Checking out files: 72% (47/65) Checking out files: 73% (48/65) Checking out files: 75% (49/65) Checking out files: 76% (50/65) Checking out files: 78% (51/65) Checking out files: 80% (52/65) Checking out files: 81% (53/65) Checking out files: 83% (54/65) Checking out files: 84% (55/65) Checking out files: 86% (56/65) Checking out files: 87% (57/65) Checking out files: 89% (58/65) Checking out files: 90% (59/65) Checking out files: 92% (60/65) Checking out files: 93% (61/65) Checking out files: 95% (62/65) Checking out files: 96% (63/65) Checking out files: 98% (64/65) Checking out files: 100% (65/65) Checking out files: 100% (65/65), done. Updating f7278da..bb39a77 Fast-forward src/TODO | 1 + src/fpsgame/fps.cpp | 3 +- src/fpsgame/game.h | 2 +- src/fpsgame/scoreboard.cpp | 24 ++++++------- src/include/GeoIP/GeoIP.h | 10 ++++++ src/include/curl/curl.h | 55 +++++++++++++++++------------ src/include/curl/curlbuild.h | 22 +++--------- src/include/curl/curlrules.h | 30 ---------------- src/include/curl/curlver.h | 12 +++---- src/include/openssl/asn1.h | 4 ++- src/include/openssl/bio.h | 4 +++ src/include/openssl/bn.h | 4 ++- src/include/openssl/dtls1.h | 8 +++++ src/include/openssl/opensslconf.h | 24 +++++++------ src/include/openssl/opensslv.h | 6 ++-- src/include/openssl/srtp.h | 4 ++- src/include/openssl/ssl.h | 28 ++++++++++----- src/include/openssl/ssl3.h | 13 +++++-- src/include/openssl/x509.h | 1 + src/lib/darwin/llvm-lto/libGeoIP.a | Bin 711632 -> 711744 bytes src/lib/darwin/llvm-lto/libcrypto.a | Bin 7862152 -> 8109248 bytes src/lib/darwin/llvm-lto/libcurl.a | Bin 2499584 -> 2567296 bytes src/lib/darwin/llvm-lto/libssl.a | Bin 1608464 -> 1644272 bytes src/lib/darwin/native/libGeoIP.a | Bin 650152 -> 650280 bytes src/lib/darwin/native/libcrypto.a | Bin 5920216 -> 5525624 bytes src/lib/darwin/native/libcurl.a | Bin 1113096 -> 1141768 bytes src/lib/darwin/native/libssl.a | Bin 983640 -> 936840 bytes src/lib/freebsd/amd64/llvm-lto/libGeoIP.a | Bin 359034 -> 359090 bytes src/lib/freebsd/amd64/llvm-lto/libcrypto.a | Bin 4109738 -> 4111556 bytes src/lib/freebsd/amd64/llvm-lto/libcurl.a | Bin 1261484 -> 1294618 bytes src/lib/freebsd/amd64/llvm-lto/libssl.a | Bin 820488 -> 820002 bytes src/lib/freebsd/amd64/native/libGeoIP.a | Bin 442198 -> 442278 bytes src/lib/freebsd/amd64/native/libcrypto.a | Bin 3994820 -> 3996654 bytes src/lib/freebsd/amd64/native/libcurl.a | Bin 782544 -> 801838 bytes src/lib/freebsd/amd64/native/libssl.a | Bin 635692 -> 635862 bytes src/lib/linux/i686/llvm-lto/libGeoIP.a | Bin 420854 -> 420906 bytes src/lib/linux/i686/llvm-lto/libcrypto.a | Bin 3853658 -> 13903848 bytes src/lib/linux/i686/llvm-lto/libcurl.a | Bin 1222768 -> 1255958 bytes src/lib/linux/i686/llvm-lto/libssl.a | Bin 804372 -> 4189446 bytes src/lib/linux/i686/native/libGeoIP.a | Bin 465546 -> 465638 bytes src/lib/linux/i686/native/libcrypto.a | Bin 3432066 -> 3081484 bytes src/lib/linux/i686/native/libcurl.a | Bin 721690 -> 738966 bytes src/lib/linux/i686/native/libssl.a | Bin 551460 -> 518602 bytes src/lib/linux/x86_64/llvm-lto/libGeoIP.a | Bin 425190 -> 425246 bytes src/lib/linux/x86_64/llvm-lto/libcrypto.a | Bin 4021242 -> 4023212 bytes src/lib/linux/x86_64/llvm-lto/libcurl.a | Bin 1252264 -> 1285950 bytes src/lib/linux/x86_64/llvm-lto/libssl.a | Bin 818964 -> 818494 bytes src/lib/linux/x86_64/native/libGeoIP.a | Bin 549958 -> 550070 bytes src/lib/linux/x86_64/native/libcrypto.a | Bin 4470272 -> 4486288 bytes src/lib/linux/x86_64/native/libcurl.a | Bin 814108 -> 833122 bytes src/lib/linux/x86_64/native/libssl.a | Bin 696644 -> 699422 bytes src/lib/win/i686/llvm-lto/libGeoIP.a | Bin 351944 -> 352068 bytes src/lib/win/i686/llvm-lto/libcrypto.a | Bin 3835294 -> 3819240 bytes src/lib/win/i686/llvm-lto/libcurl.a | Bin 1181242 -> 1209168 bytes src/lib/win/i686/llvm-lto/libssl.a | Bin 801058 -> 800792 bytes src/lib/win/i686/native/libGeoIP.a | Bin 300514 -> 300644 bytes src/lib/win/i686/native/libcrypto.a | Bin 2887700 -> 2890838 bytes src/lib/win/i686/native/libcurl.a | Bin 494472 -> 505694 bytes src/lib/win/i686/native/libssl.a | Bin 496800 -> 497848 bytes src/lib/win/x86_64/llvm-lto/libGeoIP.a | Bin 356794 -> 356922 bytes src/lib/win/x86_64/llvm-lto/libcrypto.a | Bin 4159926 -> 4161432 bytes src/lib/win/x86_64/llvm-lto/libcurl.a | Bin 1190316 -> 1218786 bytes src/lib/win/x86_64/llvm-lto/libssl.a | Bin 830552 -> 830050 bytes src/lib/win/x86_64/native/libGeoIP.a | Bin 320306 -> 320412 bytes src/mod/chatserver/chatserver.cpp | 12 +++++-- 65 files changed, 147 insertions(+), 120 deletions(-) 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/wcversion Removing src/vcpp/mingw.res Already up-to-date. Switched to branch 'sdl2' Your branch is up-to-date with 'origin/sdl2'. 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 Already up-to-date.