[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Mon, 6 Jun 2016 17:15:27 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit b6e8bdd9e9c0d54252fbecd289963a2ca79db171
Merge: f1903e8 91e8ecd
Author: Johnathan Corgan <address@hidden>
Date: Mon Jun 6 09:32:42 2016 -0700
Merge branch 'next' into next-qt5
gnuradio-runtime/lib/scheduler.h | 2 +-
gr-utils/python/modtool/grc_xml_generator.py | 2 +-
gr-utils/python/modtool/templates.py | 2 +-
grc/gui/FlowGraph.py | 7 +++++--
4 files changed, 8 insertions(+), 5 deletions(-)