eive/fsfw
eive/fsfw
14
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
pull from: mueller/master
merge into: eive:development
Conversation 0 Commits 38 Files Changed 79 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc4da433d5 - Show all commits

2
globalfunctions/timevalOperations.h
View File

@ -4,7 +4,7 @@
#include <stdint.h> #include <stdint.h>
#ifdef WIN32 #ifdef WIN32
#include <Windows.h> #include <winsock2.h>
#else #else
#include <sys/time.h> #include <sys/time.h>
#endif #endif