Merge branch 'master' into pu/mp

2025-08-31 01:11:12 +02:00 · 2017-09-13 13:40:40 +02:00
parent 2d4f52ae62 932a535b6a
commit 2c5bf73006
44 changed files with 349 additions and 687 deletions
--- a/src/driver/pictureviewer/jpeg.cpp
+++ b/src/driver/pictureviewer/jpeg.cpp
@@ -15,7 +15,6 @@
 #include <unistd.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/types.h>
 #include <sys/socket.h>

 #if __cplusplus >= 201103