[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
Date: |
Tue, 16 Aug 2016 16:30:46 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 22e3ee0a40c5b2526414277a2f07bd229d3afd71
Merge: a0ff8dc 68eb2af
Author: Johnathan Corgan <address@hidden>
Date: Tue Aug 16 09:26:32 2016 -0700
Merge branch 'next' into next-qt5
gr-digital/include/gnuradio/digital/glfsr.h | 22 +++++--------
.../include/gnuradio/digital/glfsr_source_b.h | 10 +++---
.../include/gnuradio/digital/glfsr_source_f.h | 10 +++---
gr-digital/lib/glfsr.cc | 19 ++++++++---
gr-digital/lib/glfsr_source_b_impl.cc | 38 +++++++++++-----------
gr-digital/lib/glfsr_source_b_impl.h | 14 ++++----
gr-digital/lib/glfsr_source_f_impl.cc | 38 +++++++++++-----------
gr-digital/lib/glfsr_source_f_impl.h | 18 +++++-----
gr-digital/swig/digital_swig.i | 2 ++
9 files changed, 88 insertions(+), 83 deletions(-)