Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 36 insertions, 0 deletions

diff --git a/docs/source/lang/cpp/charcast.rst b/docs/source/lang/cpp/charcast.rst
new file mode 100644
index 0000000..a480dec
--- /dev/null
+++ b/docs/source/lang/cpp/charcast.rst
@@ -0,0 +1,36 @@
+.. highlight:: cpp
+
+.. _lang-charcast:
+
+``char()`` (cast)
+=================
+
+Converts a value to the :ref:`char <lang-char>` data type.
+
+Syntax
+------
+
+``char(x)``
+
+
+Parameters
+----------
+
+**x**: a value of any type
+
+
+Returns
+-------
+
+The value, converted to a ``char``.  Note, however, that if the value
+is outside the range of a ``char`` (-128 to 127), then the results
+might be strange and unexpected.
+
+
+See Also
+--------
+
+-  :ref:`char <lang-char>`
+
+
+.. include:: cc-attribution.txt