Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Martin Woolley committed 2016-06-23 08:06:34 +01:00
commit 7bf00ff139
38 files changed
+532 -146

No files matched your search

+4
View File
@@ -4,6 +4,10 @@
MicroBitUARTService *uart;
using namespace pxt;
/**
* Support for additional Bluetooth services.
*/
//% color=#0082FB weight=20
namespace bluetooth {
/**
+3 -1
View File
@@ -1,7 +1,9 @@
// Auto-generated. Do not edit.
/**
* Support for additional Bluetooth services.
*/
//% color=#0082FB weight=20
declare namespace bluetooth {