[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'skoslo
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'skoslowski/modtool_block_modules' |
|
Date: |
Mon, 6 Jun 2016 17:15:26 +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 0f61e4e150359d4e68439085a5489f96df04f685
Merge: 5ac3233 3643b43
Author: Johnathan Corgan <address@hidden>
Date: Mon Jun 6 09:30:05 2016 -0700
Merge remote-tracking branch 'skoslowski/modtool_block_modules'
gr-utils/python/modtool/grc_xml_generator.py | 2 +-
gr-utils/python/modtool/templates.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)