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, 114 deletions

diff --git a/docs/source/foo.rst b/docs/source/foo.rst
deleted file mode 100644
index 769e666..0000000
--- a/docs/source/foo.rst
+++ /dev/null
@@ -1,114 +0,0 @@
-.. _foo:
-
-==================================
-[temporary] Converted Arduino docs
-==================================
-
-This is the index of the imported Arduino docs.
-
-.. toctree::
-   :maxdepth: 2
-
-   abs() <arduino/abs>
-   analogRead() <arduino/analogread>
-   pinMode() <arduino/pinmode>
-   Arithmetic <arduino/arithmetic>
-   Arrays <arduino/array>
-   Assignment <arduino/assignment>
-   attachInterrupt() <arduino/attachinterrupt>
-   bit <arduino/bit>
-
-.. bitclear <arduino-bitclear>
-.. bitread <arduino-bitread>
-.. bitset <arduino-bitset>
-.. bitshift <arduino-bitshift>
-.. bitwiseand <arduino-bitwiseand>
-.. bitwisecompound <arduino-bitwisecompound>
-.. bitwisexornot <arduino-bitwisexornot>
-.. bitwrite <arduino-bitwrite>
-.. boolean <arduino-boolean>
-.. booleanvariables <arduino-booleanvariables>
-.. braces <arduino-braces>
-.. break <arduino-break>
-.. byte <arduino-byte>
-.. bytecast <arduino-bytecast>
-.. changes <arduino-changes>
-.. char <arduino-char>
-.. charcast <arduino-charcast>
-.. comments <arduino-comments>
-.. comparison <arduino-comparison>
-.. const <arduino-const>
-.. constants <arduino-constants>
-.. constrain <arduino-constrain>
-.. continue <arduino-continue>
-.. cos <arduino-cos>
-.. define <arduino-define>
-.. delay <arduino-delay>
-.. delaymicroseconds <arduino-delaymicroseconds>
-.. detachinterrupt <arduino-detachinterrupt>
-.. digitalread <arduino-digitalread>
-.. digitalwrite <arduino-digitalwrite>
-.. double <arduino-double>
-.. dowhile <arduino-dowhile>
-.. else <arduino-else>
-.. float <arduino-float>
-.. floatcast <arduino-floatcast>
-.. for <arduino-for>
-.. fpconstants <arduino-fpconstants>
-.. goto <arduino-goto>
-.. highbyte <arduino-highbyte>
-.. homepage <arduino-homepage>
-.. if <arduino-if>
-.. include <arduino-include>
-.. increment <arduino-increment>
-.. incrementcompound <arduino-incrementcompound>
-.. int <arduino-int>
-.. intcast <arduino-intcast>
-.. integerconstants <arduino-integerconstants>
-.. interrupts <arduino-interrupts>
-.. libraries <arduino-libraries>
-.. long <arduino-long>
-.. longcast <arduino-longcast>
-.. loop <arduino-loop>
-.. lowbyte <arduino-lowbyte>
-.. map <arduino-map>
-.. max <arduino-max>
-.. micros <arduino-micros>
-.. millis <arduino-millis>
-.. min <arduino-min>
-.. modulo <arduino-modulo>
-.. nointerrupts <arduino-nointerrupts>
-.. notone <arduino-notone>
-.. pointer <arduino-pointer>
-.. pow <arduino-pow>
-.. pulsein <arduino-pulsein>
-.. random <arduino-random>
-.. randomseed <arduino-randomseed>
-.. return <arduino-return>
-.. scope <arduino-scope>
-.. semicolon <arduino-semicolon>
-.. serial <arduino-serial>
-.. setup <arduino-setup>
-.. shiftout <arduino-shiftout>
-.. sin <arduino-sin>
-.. sizeof <arduino-sizeof>
-.. sqrt <arduino-sqrt>
-.. static <arduino-static>
-.. string <arduino-string>
-.. stringobject <arduino-stringobject>
-.. switchcase <arduino-switchcase>
-.. tan <arduino-tan>
-.. tone <arduino-tone>
-.. unsignedchar <arduino-unsignedchar>
-.. unsignedint <arduino-unsignedint>
-.. unsignedlong <arduino-unsignedlong>
-.. void <arduino-void>
-.. volatile <arduino-volatile>
-.. while <arduino-while>
-.. word <arduino-word>
-.. wordcast <arduino-wordcast>
-
-.. TODO later
-
-.. analogreference() <arduino/analogreference>
-.. analogWrite() <arduino/analogwrite>