Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 0 insertions, 33 deletions

diff --git a/docs/source/arduino/dowhile.rst b/docs/source/arduino/dowhile.rst
deleted file mode 100644
index 48fe75b..0000000
--- a/docs/source/arduino/dowhile.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-.. _arduino-dowhile:
-
-do - while
-==========
-
-The **do** loop works in the same manner as the **while** loop,
-with the exception that the condition is tested at the end of the
-loop, so the **do** loop will *always* run at least once.
-
-
-
-::
-
-    do
-    {
-        // statement block
-    } while (test condition);
-
-
-
-Example
--------
-
-::
-
-    do
-    {
-      delay(50);          // wait for sensors to stabilize
-      x = readSensors();  // check the sensors
-    
-    } while (x < 100);
-
-