aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2014-05-27 07:53:14 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2014-05-27 07:53:14 -0700
commit06003ad08f2db760c1d4bb95daaf4f951dad5ab2 (patch)
tree4032d9c781ed54c4160ece8f42c439820cc5611e /host
parentc4b1f8103343b9932ca1e74128de3afbbcb81928 (diff)
parent997d9d5b187ce9b9e33aa89755d41c2f5c65af5e (diff)
downloaduhd-06003ad08f2db760c1d4bb95daaf4f951dad5ab2.tar.gz
uhd-06003ad08f2db760c1d4bb95daaf4f951dad5ab2.tar.bz2
uhd-06003ad08f2db760c1d4bb95daaf4f951dad5ab2.zip
Merge branch 'maint'
Diffstat (limited to 'host')
-rw-r--r--host/include/uhd/property_tree.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/include/uhd/property_tree.hpp b/host/include/uhd/property_tree.hpp
index 47b2c5736..f889ba235 100644
--- a/host/include/uhd/property_tree.hpp
+++ b/host/include/uhd/property_tree.hpp
@@ -38,7 +38,7 @@ public:
/*!
* Register a coercer into the property.
- * A coercer is a special subscribes that coerces the value.
+ * A coercer is a special subscriber that coerces the value.
* Only one coercer may be registered per property.
* Registering a coercer replaces the previous coercer.
* \param coercer the coercer callback function