Merge branch 'master' into release

Jussi Vatjus-Anttila · Jussi Vatjus-Anttila · commit 546e73690b75 · 2016-04-28T09:29:07.000+03:00
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
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "mbed-trace",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.1.3",`
`4`	`4`	`"description": "Trace library for mbed devices",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"trace",`