diff options
author | Grant Limberg <glimberg@gmail.com> | 2015-11-02 18:32:21 -0800 |
---|---|---|
committer | Grant Limberg <glimberg@gmail.com> | 2015-11-02 18:32:21 -0800 |
commit | 179b064b05460b706526a3249a25cd07232a42f5 (patch) | |
tree | d26dfeb2c02ce59c4a531142684695e45bb515ad /version.h | |
parent | 75a191a8564030f4d5e99aca76b980e2d69abd20 (diff) | |
parent | 4e9d4304761f93a1764d3ec2d2b0c38140decad8 (diff) | |
download | infinitytier-179b064b05460b706526a3249a25cd07232a42f5.tar.gz infinitytier-179b064b05460b706526a3249a25cd07232a42f5.zip |
Merge branch 'edge' into android-jni-dev
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -36,11 +36,11 @@ /** * Minor version */ -#define ZEROTIER_ONE_VERSION_MINOR 0 +#define ZEROTIER_ONE_VERSION_MINOR 1 /** * Revision */ -#define ZEROTIER_ONE_VERSION_REVISION 6 +#define ZEROTIER_ONE_VERSION_REVISION 0 #endif |