[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, 25 Sep 2014 16:20:02 +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 221459befafea980a370b93bc9ce7612b27f7e07
Merge: 17aabfe cecf6f7
Author: Tom Rondeau <address@hidden>
Date: Thu Sep 25 12:19:01 2014 -0400
Merge branch 'master' into next
docs/doxygen/other/build_guide.dox | 4 +--
gr-blocks/lib/keep_m_in_n_impl.cc | 57 +++++++++++++++++++++++++++++++-------
gr-blocks/lib/keep_m_in_n_impl.h | 6 ++--
volk/lib/CMakeLists.txt | 6 ++++
4 files changed, 58 insertions(+), 15 deletions(-)