[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
Date: |
Wed, 1 Oct 2014 15:49:34 +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 58cbeb5b9594a0b9f781b80c1727110e5c6cebe6
Merge: 221459b ec67ecb
Author: Tom Rondeau <address@hidden>
Date: Wed Oct 1 11:48:19 2014 -0400
Merge branch 'master' into next
docs/doxygen/other/stream_tags.dox | 5 ++++-
gr-blocks/lib/message_strobe_impl.cc | 8 ++++----
gr-blocks/lib/message_strobe_impl.h | 2 +-
gr-blocks/lib/message_strobe_random_impl.cc | 4 ++--
gr-blocks/lib/message_strobe_random_impl.h | 2 +-
gr-blocks/lib/throttle_impl.cc | 8 ++++++++
gr-blocks/lib/throttle_impl.h | 3 +++
gr-uhd/lib/usrp_source_impl.cc | 15 +--------------
8 files changed, 24 insertions(+), 23 deletions(-)