diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 15:08:36 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-09-22 15:08:36 -0700 |
commit | 30848c05e64b2f17d7889c5ef6a979079718f652 (patch) | |
tree | 17eb121e68875119de13704049b980170c9c40de /gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h | |
parent | b29f5d3bef660a083e077237ffe5e4e47bab7cdb (diff) | |
parent | bbed667ecc7ff1ced67fbc87ac66f2b5299a4dc0 (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h')
-rw-r--r-- | gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h index 17495152b8..13857ead5f 100644 --- a/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h +++ b/gr-zeromq/include/gnuradio/zeromq/pull_msg_source.h @@ -46,7 +46,7 @@ namespace gr { * \brief Return a shared_ptr to a new instance of gr::zeromq::pull_msg_source. * * \param address ZMQ socket address specifier - * \param timeout Receive timeout in seconds, default is 100ms, 1us increments + * \param timeout Receive timeout in milliseconds, default is 100ms, 1us increments * */ static sptr make(char *address, int timeout=100); |