Merge branch 'master' into release

PelionIoT · Apr 28, 2016 · 546e736 · 546e736
2 parents 5ec9299 + 772bd3b
commit 546e736
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/module.json b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "mbed-trace",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Trace library for mbed devices",
   "keywords": [
     "trace",

diff --git a/source/mbed_trace.c b/source/mbed_trace.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "mbed-trace/mbed_trace.h"
-#if YOTTA_CFG_MTRACE_FEA_IPV6 == 1
+#if YOTTA_CFG_MBED_TRACE_FEA_IPV6 == 1
 #include "mbed-trace/mbed_trace_ip6tos.h"
 #endif