[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint |
|
Date: |
Sun, 14 Jun 2015 16:34:14 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 1ff0e745963084b86ad4d25e12f889f1b93775aa
Merge: e8165e7 42c892c
Author: Johnathan Corgan <address@hidden>
Date: Sun Jun 14 09:15:49 2015 -0700
Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
grc/base/Connection.py | 2 +-
grc/base/ParseXML.py | 31 ++++++++++++++++++-------------
grc/gui/PropsDialog.py | 7 +++++--
grc/python/Generator.py | 2 +-
4 files changed, 25 insertions(+), 17 deletions(-)
- [Commit-gnuradio] [gnuradio] branch maint updated (e8165e7 -> 1ff0e74), git, 2015/06/14
- [Commit-gnuradio] [gnuradio] 03/06: grc: better Popen argument handling for CLI based apps, git, 2015/06/14
- [Commit-gnuradio] [gnuradio] 05/06: grc: save grc files utf-8 encoded (#792), git, 2015/06/14
- [Commit-gnuradio] [gnuradio] 01/06: grc: stop using gtk forall() (#793), git, 2015/06/14
- [Commit-gnuradio] [gnuradio] 02/06: grc: fix file load error when connections are not unique (#794), git, 2015/06/14
- [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint,
git <=
- [Commit-gnuradio] [gnuradio] 04/06: grc: clean-up ParseXML, git, 2015/06/14