diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 09:56:09 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 09:56:09 -0700 |
| commit | 6eecbd89436bd73c903885803653481152403f98 (patch) | |
| tree | 94528de794a80d958616945e740eb5971d5d7e45 /gr-uhd | |
| parent | d7eaf6e1ed531c1e765905875669282ae79752ee (diff) | |
| parent | 037b34f9de04eec6d31941abff4e53fec83b0fe5 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/include/gnuradio/uhd/usrp_block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_block.h b/gr-uhd/include/gnuradio/uhd/usrp_block.h index 3c159056b7..6e4245e862 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_block.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_block.h @@ -393,7 +393,7 @@ namespace gr { virtual ::uhd::time_spec_t get_time_now(size_t mboard = 0) = 0; /*! - * Get the time when the last pps pulse occured. + * Get the time when the last pps pulse occurred. * \param mboard the motherboard index 0 to M-1 * \return the current usrp time */ |