Skip to content

Y
ygopro
Commit 6d529246 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'develop' into server-develop

parents faed30ec edef2736
Pipeline #40079 passed with stages
        in 12 minutes and 1 second
        Hide whitespace changes
        Inline Side-by-side
        Showing with 2 additions and 2 deletions
        gframe/config.h
        View file @ 6d529246
        ...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
        #define IRR_COMPILE_WITH_DX9_DEV_PACK #define IRR_COMPILE_WITH_DX9_DEV_PACK
        #include <cerrno> #include <cerrno>
        #include <vector>
        #ifdef _WIN32 #ifdef _WIN32
        ...@@ -31,7 +32,6 @@ ...@@ -31,7 +32,6 @@
        #include <arpa/inet.h> #include <arpa/inet.h>
        #include <netdb.h> #include <netdb.h>
        #include <unistd.h> #include <unistd.h>
        #include <vector>
        #define SD_BOTH 2 #define SD_BOTH 2
        #define SOCKET int #define SOCKET int
        ......
        ocgcore @ d3deef29
        Subproject commit 3d2ddc7341c648b0552104473bf934e305411f97 Subproject commit d3deef2919e1d05c8e42303fb3aedbf256c91f3f
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment