[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: |
Thu, 16 Oct 2014 16:55:18 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 1917e248ec308f74446c97741d005596b93864d9
Merge: e6ab244 d957413
Author: Tom Rondeau <address@hidden>
Date: Thu Oct 16 12:54:00 2014 -0400
Merge branch 'master' into next
gr-qtgui/include/gnuradio/qtgui/number_sink.h | 20 +++++++++++++++-
gr-qtgui/lib/number_sink_impl.cc | 34 +++++++++++++++++++++++----
gr-qtgui/lib/number_sink_impl.h | 2 ++
3 files changed, 51 insertions(+), 5 deletions(-)