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 /node/Peer.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 'node/Peer.hpp')
| -rw-r--r-- | node/Peer.hpp | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/node/Peer.hpp b/node/Peer.hpp index d9ed5670..e36b0c7b 100644 --- a/node/Peer.hpp +++ b/node/Peer.hpp @@ -30,6 +30,8 @@  #include <stdint.h> +#include "Constants.hpp" +  #include <algorithm>  #include <utility>  #include <vector> @@ -37,7 +39,6 @@  #include "../include/ZeroTierOne.h" -#include "Constants.hpp"  #include "RuntimeEnvironment.hpp"  #include "Path.hpp"  #include "Address.hpp" | 
