[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint' into master
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: Merge branch 'maint' into master |
|
Date: |
Thu, 26 Jan 2017 14:46:40 +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 3c78606949f6f40827244c4e338663f69344a171
Merge: 03fbdc9 efe8786
Author: Sebastian Koslowski <address@hidden>
Date: Wed Jan 25 20:50:47 2017 +0100
Merge branch 'maint' into master
grc/core/Port.py | 193 ++++++++++++++++++++++------------------
grc/core/generator/Generator.py | 6 +-
2 files changed, 107 insertions(+), 92 deletions(-)