[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: |
Tue, 18 Apr 2017 20:53:30 +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 af48cf4989adc56e82c6a86fbbef4c61688de7ce
Merge: 385f0d4 b44e38c
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 18 13:46:20 2017 -0700
Merge branch 'master' into next
grc/blocks/parameter.xml | 17 +++++++++++++++++
grc/core/generator/Generator.py | 1 +
2 files changed, 18 insertions(+)