[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'smunau
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'smunaut/fix_wx' into maint |
|
Date: |
Tue, 14 Jan 2014 00:31:14 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch maint
in repository gnuradio.
commit c3fc18011f2712708dd70451437679f1c14736b9
Merge: 10225ae 9842734
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 13 19:05:13 2014 -0500
Merge remote-tracking branch 'smunaut/fix_wx' into maint
gr-wxgui/python/wxgui/stdgui2.py | 25 +++++++++++--------------
grc/python/flow_graph.tmpl | 4 ++--
2 files changed, 13 insertions(+), 16 deletions(-)