[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: |
Sat, 3 Oct 2015 19:46:48 +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 c8342fd9aed8ed1bcf0062dc02637ad11269642e
Merge: 73ae366 8a4904d
Author: Johnathan Corgan <address@hidden>
Date: Sat Oct 3 12:40:18 2015 -0700
Merge branch 'master' into next
grc/gui/Block.py | 9 +++++++--
grc/python/flow_graph.tmpl | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)