[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint' |
|
Date: |
Thu, 25 Sep 2014 16:19:57 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit f75ae72a8fd49efaf2e8e142e6cc2022885f37ef
Merge: 26169d2 0efc179
Author: Tom Rondeau <address@hidden>
Date: Thu Sep 25 11:54:27 2014 -0400
Merge branch 'maint'
gr-blocks/lib/keep_m_in_n_impl.cc | 57 ++++++++++++++++++++++++++++++++-------
gr-blocks/lib/keep_m_in_n_impl.h | 6 ++---
2 files changed, 50 insertions(+), 13 deletions(-)