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

diff --git a/docs/source/arduino/unsignedlong.rst b/docs/source/arduino/unsignedlong.rst
deleted file mode 100644
index 1bdb434..0000000
--- a/docs/source/arduino/unsignedlong.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. _arduino-unsignedlong:
-
-unsigned long
-=============
-
-Description
------------
-
-Unsigned long variables are extended size variables for number
-storage, and store 32 bits (4 bytes). Unlike standard longs
-unsigned longs won't store negative numbers, making their range
-from 0 to 4,294,967,295 (2^32 - 1).
-
-
-
-Example
--------
-
-::
-
-    unsigned long time;
-    
-    void setup()
-    {
-      Serial.begin(9600);
-    }
-    
-    void loop()
-    {
-      Serial.print("Time: ");
-      time = millis();
-      //prints time since program started
-      Serial.println(time);
-      // wait a second so as not to send massive amounts of data
-      delay(1000);
-    }
-
-Syntax
-------
-
-::
-
-        unsigned long var = val;
-
-
-
-
--  var - your long variable name
--  val - the value you assign to that variable
-
-
-
-See Also
---------
-
-
--  `byte <http://arduino.cc/en/Reference/Byte>`_
--  `int <http://arduino.cc/en/Reference/Int>`_
--  `unsigned int <http://arduino.cc/en/Reference/UnsignedInt>`_
--  `long <http://arduino.cc/en/Reference/Long>`_
--  `Variable Declaration <http://arduino.cc/en/Reference/VariableDeclaration>`_
-
-