Merge branch '2.2' into disp_flip

pull/48/head
Qrome 2018-09-27 07:24:44 -07:00 committed by GitHub
commit e6ab9c2994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1244 additions and 1244 deletions

View File

@ -1,4 +1,4 @@
/** The MIT License (MIT) /** The MIT License (MIT)
Copyright (c) 2018 David Payne Copyright (c) 2018 David Payne
@ -27,7 +27,7 @@ SOFTWARE.
#include "Settings.h" #include "Settings.h"
#define VERSION "2.1" #define VERSION "2.2"
#define HOSTNAME "OctMon-" #define HOSTNAME "OctMon-"
#define CONFIG "/conf.txt" #define CONFIG "/conf.txt"