merge resolved

This commit is contained in:
2019-08-21 14:25:21 +02:00
31 changed files with 600 additions and 207 deletions

View File

@ -44,7 +44,6 @@ class sockaddr_in;
#include <stdio.h>
#include "logger.h"
#define DEFAULT_PACKET_SIZE 1286
#define SOCKET_BUFFER_SIZE (100*1024*1024) //100 MB
#define DEFAULT_BACKLOG 5

View File

@ -5,6 +5,6 @@
#define APIGUI 0x190723
#define APIMOENCH 0x190820
#define APIGOTTHARD 0x190820
#define APICTB 0x190820
#define APIJUNGFRAU 0x190820
#define APIEIGER 0x190820
#define APIJUNGFRAU 0x190820
#define APICTB 0x190821