[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: |
Wed, 1 Oct 2014 17:21:57 +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 db4b313472bf4dd0cedc634bd0f11d43c409931a
Merge: f44ad38 029079c
Author: Tom Rondeau <address@hidden>
Date: Wed Oct 1 13:21:10 2014 -0400
Merge branch 'master' into next
gr-blocks/lib/keep_m_in_n_impl.cc | 6 +++---
volk/lib/CMakeLists.txt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)