[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: |
Wed, 8 Apr 2015 23:27:18 +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 4b935f910fbdd4e18bbf704060de92d3eedb5e1e
Merge: 7d6c6df e2815ab
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 8 16:23:30 2015 -0700
Merge branch 'master' into next
.../include/gnuradio/blocks/peak_detector2_fb.h | 2 +-
gr-blocks/lib/peak_detector2_fb_impl.cc | 8 +-
gr-blocks/lib/peak_detector2_fb_impl.h | 2 +-
gr-qtgui/python/qtgui/range.py | 196 ++++++++++++---------
4 files changed, 120 insertions(+), 88 deletions(-)