eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
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 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4100bb19ce - Show all commits

5
timemanager/Clock.h
View File

@ -6,7 +6,10 @@
#include "../globalfunctions/timevalOperations.h"
#include <cstdint>
#ifndef WIN32
#ifdef WIN32
#include <winsock2.h>
#else
#include <sys/time.h>
#endif