[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 23 Feb 2015 12:26:15 +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 4c8ac632ecd70438b50ce7b9bc6046d182a0cc18
Merge: a374ec0 8ecfd13
Author: Johnathan Corgan <address@hidden>
Date: Mon Feb 23 04:20:33 2015 -0800
Merge branch 'master' into next
gr-blocks/grc/blocks_integrate_xx.xml | 10 +++++++++-
gr-blocks/include/gnuradio/blocks/integrate_XX.h.t | 2 +-
gr-blocks/lib/integrate_XX_impl.cc.t | 23 +++++++++++++---------
gr-blocks/lib/integrate_XX_impl.h.t | 4 ++--
gr-blocks/python/blocks/qa_integrate.py | 22 +++++++++++++++++++++
gr-digital/grc/digital_additive_scrambler_bb.xml | 8 +++++++-
6 files changed, 55 insertions(+), 14 deletions(-)