sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts master into devicesettings

Browse Source
This commit is contained in:
Paul Hollinsky
2018-09-26 18:24:59 -04:00
parent a5b79167b9 4c45b235bc
commit 399c72e61d
40 changed files with 142 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/message/include/canmessage.h
+1 -1
View File
@@ -10,6 +10,6 @@ public:
uint32_t arbid;
};
};
}
#endif
communication/message/include/message.h
+1 -1
View File
@@ -14,6 +14,6 @@ public:
uint64_t timestamp;
};
};
}
#endif
communication/message/include/neomessage.h
+4 -2
View File
@@ -32,8 +32,10 @@ typedef struct {
#include "communication/message/include/message.h"
namespace icsneo {
neomessage_t CreateNeoMessage(const Message& message);
};
neomessage_t CreateNeoMessage(const Message& message);
}
#endif
#endif