diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-04 20:12:26 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-04 20:12:26 -0700 |
| commit | bdc5b3d3a509306b2da3548b4d4ac573eb393c61 (patch) | |
| tree | 887a80183023f027ee85cb625f5a6542a6a3d839 /include | |
| parent | e28712555d87c10965a8dcd46da6800a4f2e6326 (diff) | |
| parent | 40f312a827ffecf7d5a233ee5d13b0a3bc88e8a6 (diff) | |
| download | infinitytier-bdc5b3d3a509306b2da3548b4d4ac573eb393c61.tar.gz infinitytier-bdc5b3d3a509306b2da3548b4d4ac573eb393c61.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index fd1cf81b..ecc2edef 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -416,7 +416,7 @@ typedef struct uint64_t nwid; /** - * Ethernet MAC (40 bits) that should be assigned to port + * Ethernet MAC (48 bits) that should be assigned to port */ uint64_t mac; |