[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, 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
in repository gnuradio.
commit 3ec66e9a9f141d737ce0b9b8edd51e05c3943497
Merge: bddc905 ddb1e77
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 28 08:41:25 2015 -0800
Merge branch 'master' into next
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(-)