[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: |
Tue, 14 Jan 2014 00:31:28 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 87cce11b9b2cf8cd984c5cf6ed9961dd30db4992
Merge: efb2db6 f7f28bb
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 13 19:31:15 2014 -0500
Merge branch 'master' into next
gr-wxgui/python/wxgui/stdgui2.py | 25 +++++++++++--------------
grc/python/flow_graph.tmpl | 4 ++--
2 files changed, 13 insertions(+), 16 deletions(-)