[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: |
Fri, 30 Jan 2015 16:57:27 +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 8de3c4ce4be79dd7dba4d7ec1371cd010328fec1
Merge: 77862dd c815a01
Author: Johnathan Corgan <address@hidden>
Date: Fri Jan 30 08:53:57 2015 -0800
Merge branch 'master' into next
gr-qtgui/lib/time_sink_c_impl.cc | 4 ++--
gr-qtgui/lib/time_sink_f_impl.cc | 4 ++--
gr-wxgui/python/wxgui/plotter/gltext.py | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)