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

diff --git a/docs/source/arduino/long.rst b/docs/source/arduino/long.rst
deleted file mode 100644
index 3d59896..0000000
--- a/docs/source/arduino/long.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-.. _arduino-long:
-
-long
-====
-
-Description
------------
-
-Long variables are extended size variables for number storage, and
-store 32 bits (4 bytes), from -2,147,483,648 to 2,147,483,647.
-
-
-
-Example
--------
-
-
-
-::
-
-        long speedOfLight = 186000L;   // see Integer Constants for explanation of the 'L'
-
-
-
-Syntax
-------
-
-::
-
-        long var = val;
-
-
-
-
--  var - the long variable name
--  val - the value assigned to the 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>`_
--  `unsigned long <http://arduino.cc/en/Reference/UnsignedLong>`_
--  `Integer Constants <http://arduino.cc/en/Reference/IntegerConstants>`_
--  `Variable Declaration <http://arduino.cc/en/Reference/VariableDeclaration>`_
-