Merge remote-tracking branch 'upstream/master'

2016-06-23 08:06:34 +01:00
parent 82e34d852c 7cd8ee1e23
commit 7bf00ff139
38 changed files with 532 additions and 146 deletions
--- a/libs/microbit-bluetooth/bluetooth.cpp
+++ b/libs/microbit-bluetooth/bluetooth.cpp
@ -4,6 +4,10 @@
 MicroBitUARTService *uart;

 using namespace pxt;
+
+/**
+ * Support for additional Bluetooth services.
+ */
 //% color=#0082FB weight=20
 namespace bluetooth {
    /**