diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
| commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
| tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /gr-uhd | |
| parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
| parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
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 */ |