[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'master' into next |
|
Date: |
Sun, 23 Apr 2017 13:38:41 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit fe2a5e1997d5682ef6325f6526f721c0f7824db3
Merge: af48cf4 082711c
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 23 06:17:27 2017 -0700
Merge branch 'master' into next
gr-analog/include/gnuradio/analog/frequency_modulator_fc.h | 2 +-
gr-digital/lib/correlate_access_code_bb_impl.cc | 10 ++++------
gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 11 +++++------
gr-digital/lib/correlate_access_code_ff_ts_impl.cc | 11 +++++------
gr-digital/lib/correlate_access_code_tag_bb_impl.cc | 13 +++++--------
gr-digital/lib/correlate_access_code_tag_ff_impl.cc | 13 +++++--------
gr-qtgui/lib/time_sink_c_impl.cc | 13 ++++++++-----
gr-qtgui/lib/time_sink_f_impl.cc | 13 ++++++++-----
8 files changed, 41 insertions(+), 45 deletions(-)