[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'courta
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'courtarro/video_sink_grc' |
Date: |
Wed, 4 Mar 2015 15:58:09 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 60addb0eab80bf6ce99a2afedea795907b7db1a4
Merge: 18a4dbf a0a9cae5
Author: Johnathan Corgan <address@hidden>
Date: Wed Mar 4 07:53:12 2015 -0800
Merge remote-tracking branch 'courtarro/video_sink_grc'
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(+)