[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint' |
|
Date: |
Mon, 28 Dec 2015 16:49:56 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit ddb1e778b5ad4a7e78132f42854cd6a2db973a2d
Merge: d5fc1c6 815a7cf
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 28 08:41:17 2015 -0800
Merge branch 'maint'
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(-)