[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnurad
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnuradio-github/pr/1265' |
Date: |
Tue, 18 Apr 2017 20:53:29 +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 b44e38ce759dff9622c78863c20e6c0473c76a29
Merge: a8e4181 89d80fa
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 18 13:46:05 2017 -0700
Merge remote-tracking branch 'gnuradio-github/pr/1265'
grc/blocks/parameter.xml | 17 +++++++++++++++++
grc/core/generator/Generator.py | 1 +
2 files changed, 18 insertions(+)