summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-07-30 12:17:18 -0700
committerJosh Blum <josh@joshknows.com>2012-07-30 12:17:18 -0700
commit4896bf78d34b3b1b3cb56b2ff1d3fb58ad991014 (patch)
tree60c26759405a8e0b659c85b48a14f0f36d3c0f9b
parent73c2c25c11069e32918eb592209539bb563e55c2 (diff)
parent599e68fd1d0d63423de2fa43eb746eb78127df71 (diff)
downloaduhd-4896bf78d34b3b1b3cb56b2ff1d3fb58ad991014.tar.gz
uhd-4896bf78d34b3b1b3cb56b2ff1d3fb58ad991014.tar.bz2
uhd-4896bf78d34b3b1b3cb56b2ff1d3fb58ad991014.zip
Merge branch 'master' into next
-rw-r--r--host/cmake/Modules/UHDVersion.cmake2
-rw-r--r--host/docs/stream.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 38cbe819c..01a754f48 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET)
########################################################################
SET(UHD_VERSION_MAJOR 003)
SET(UHD_VERSION_MINOR 004)
-SET(UHD_VERSION_PATCH 002)
+SET(UHD_VERSION_PATCH 003)
########################################################################
# Version information discovery through git log
diff --git a/host/docs/stream.rst b/host/docs/stream.rst
index 13523c077..a00ef88ee 100644
--- a/host/docs/stream.rst
+++ b/host/docs/stream.rst
@@ -44,7 +44,7 @@ Typically, the data type is complex baseband such as normalized **complex-float3
The link-layer data type
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
The link-layer or "over-the-wire" data type refers to the format of the samples sent through the link.
-Typically, this data type is **complex-int16*.
+Typically, this data type is **complex-int16**.
However, to increase throughput over the link-layer,
at the expense of precision, **complex-int8** may be used.