Merge branch 'feature-MAX-98' into develop

This commit is contained in:
MassimilianoPinto 2014-05-26 14:05:47 +02:00
commit 040e7158fc

View File

@ -51,7 +51,7 @@ extern int lm_enabled_logfiles_bitmask;
static void monitorMain(void *);
static char *version_str = "V1.0.0";
static char *version_str = "V1.1.0";
static void *startMonitor(void *);
static void stopMonitor(void *);