[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, 4 Mar 2015 15:58:10 +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 6f6a4f7d0b51bc15318381c80e474500a5e8e2a1
Merge: 79e3024 60addb0
Author: Johnathan Corgan <address@hidden>
Date: Wed Mar 4 07:54:21 2015 -0800
Merge branch 'master' into next
gr-video-sdl/CMakeLists.txt | 1 +
gr-video-sdl/grc/CMakeLists.txt | 27 +++++++++++
gr-video-sdl/grc/video_block_tree.xml | 13 ++++++
gr-video-sdl/grc/video_sdl_sink.xml | 86 +++++++++++++++++++++++++++++++++++
4 files changed, 127 insertions(+)