Merge branch 'main' of gitlab.ethz.ch:severikl/blackjack into main

589bc37f · LUCA WOLFART · 53ee8ee4 · 70b5fb8c · 53ee8ee4 · 53ee8ee4
Commit 589bc37f authored 2 years ago by LUCA WOLFART
--- a/sockpp/cmake-build-debug/CMakeFiles/sockpp.dir/progress.make
+++ b/sockpp/cmake-build-debug/CMakeFiles/sockpp.dir/progress.make
-CMAKE_PROGRESS_1 = 1
-
--- a/sockpp/cmake-build-debug/Makefile
+++ b/sockpp/cmake-build-debug/Makefile
--- a/sockpp/cmake-build-debug/Testing/Temporary/LastTest.log
+++ b/sockpp/cmake-build-debug/Testing/Temporary/LastTest.log
-Start testing: May 06 10:51 CEST
----------------------------------------------------------
-End testing: May 06 10:51 CEST
--- a/sockpp/cmake-build-debug/cmake_install.cmake
+++ b/sockpp/cmake-build-debug/cmake_install.cmake
--- a/sockpp/cmake-build-debug/generated/sockpp/version.h
+++ b/sockpp/cmake-build-debug/generated/sockpp/version.h
--- a/sockpp/cmake-build-debug/libsockpp.so
+++ b/sockpp/cmake-build-debug/libsockpp.so
-libsockpp.so.0
\ No newline at end of file
--- a/sockpp/cmake-build-debug/libsockpp.so.0
+++ b/sockpp/cmake-build-debug/libsockpp.so.0
-libsockpp.so.0.7.0
\ No newline at end of file
--- a/sockpp/cmake-build-debug/libsockpp.so.0.7.0
+++ b/sockpp/cmake-build-debug/libsockpp.so.0.7.0
--- a/sockpp/cmake-build-debug/sockpp.cbp
+++ b/sockpp/cmake-build-debug/sockpp.cbp
--- a/sockpp/cmake-build-debug/src/CMakeFiles/CMakeDirectoryInformation.cmake
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/CMakeDirectoryInformation.cmake
--- a/sockpp/cmake-build-debug/src/CMakeFiles/progress.marks
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/progress.marks
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/DependInfo.cmake
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/DependInfo.cmake
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/acceptor.cpp.o
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/acceptor.cpp.o
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/acceptor.cpp.o.d
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/acceptor.cpp.o.d
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/build.make
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/build.make
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/cmake_clean.cmake
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/cmake_clean.cmake
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/compiler_depend.make
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/compiler_depend.make
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/compiler_depend.ts
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/compiler_depend.ts
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/connector.cpp.o
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/connector.cpp.o
--- a/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/connector.cpp.o.d
+++ b/sockpp/cmake-build-debug/src/CMakeFiles/sockpp-objs.dir/connector.cpp.o.d