[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: |
Mon, 28 Dec 2015 16:49:57 +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 9561b1706c636c7519f01ec7d6c12561d933d57a
Merge: 7b896ac 3ec66e9
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 28 08:41:34 2015 -0800
Merge branch 'next' into next-qt5
gr-blocks/include/gnuradio/blocks/add_const_bb.h | 6 +++---
gr-blocks/lib/add_const_bb_impl.cc | 16 ++++++++--------
gr-blocks/lib/add_const_bb_impl.h | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)