[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: |
Mon, 5 Sep 2016 16:38:31 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 6d41a10469156fc6e906c70822b254c997781ca8
Merge: 9501598 b21ce80
Author: Johnathan Corgan <address@hidden>
Date: Mon Sep 5 09:29:45 2016 -0700
Merge branch 'master' into next
gr-blocks/grc/blocks_block_tree.xml | 3 ---
gr-blocks/grc/blocks_message_burst_source.xml | 1 +
gr-blocks/grc/blocks_message_sink.xml | 1 +
gr-blocks/grc/blocks_message_source.xml | 1 +
gr-blocks/include/gnuradio/blocks/message_burst_source.h | 2 +-
gr-blocks/include/gnuradio/blocks/message_sink.h | 2 +-
gr-blocks/include/gnuradio/blocks/message_source.h | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)