diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-24 16:48:48 -0700 |
| commit | 0f808e11df8646e82eb3e178896dc8d88f8d79d3 (patch) | |
| tree | a09e8c27911f73e65ab2ec0ef0068d143d89a72c /osdep/Thread.hpp | |
| parent | 1a65a79e57521a0d20d6a2c6d18ab8cf169fcd50 (diff) | |
| parent | ce09e363dc95d801e8707a29a0d585089d6c3d09 (diff) | |
| download | infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.tar.gz infinitytier-0f808e11df8646e82eb3e178896dc8d88f8d79d3.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'osdep/Thread.hpp')
| -rw-r--r-- | osdep/Thread.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/Thread.hpp b/osdep/Thread.hpp index f0dd3777..1dfb9ab5 100644 --- a/osdep/Thread.hpp +++ b/osdep/Thread.hpp @@ -37,7 +37,7 @@ #include <WinSock2.h>
#include <Windows.h>
#include <string.h>
-#include "Mutex.hpp"
+#include "../node/Mutex.hpp"
namespace ZeroTier {
|