From 309b670b9b8778f314076b0606d6578ab031ad16 Mon Sep 17 00:00:00 2001
From: FreeArtMan <dos21h@gmail.com>
Date: Sun, 9 Jul 2017 11:33:45 +0100
Subject: Merged with feature branch F-4

---
 config_all_cmds.h | 2 +-
 version.h         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config_all_cmds.h b/config_all_cmds.h
index c2cdabf..1170e5f 100644
--- a/config_all_cmds.h
+++ b/config_all_cmds.h
@@ -10,8 +10,8 @@
 #include "cmd/cmd_loadavg.h"
 #include "cmd/cmd_uptime.h"
 #include "cmd/cmd_rand_libc.h"
-#include "cmd/cmd_ping.h"
 #include "cmd/cmd_botu.h"
+#include "cmd/cmd_ping.h"
 #include "cmd/cmd_fir.h"
 #include "cmd/cmd_sum.h"
 #include "cmd/cmd_help.h"
diff --git a/version.h b/version.h
index d1961f2..416d3f6 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #ifndef __VERSION_H
 #define __VERSION_H
-#define VERSION_DATE "Thu Jul 6 14:22:25 BST 2017"
-#define VERSION_COMMIT "803d146 Added config loading library"
+#define VERSION_DATE "Sun Jul 9 11:32:45 BST 2017"
+#define VERSION_COMMIT "1ff5fed Support for config files, ofc we use ini"
 #endif
-- 
cgit v1.2.3