[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'next' into next-qt5 |
|
Date: |
Mon, 25 Apr 2016 22:56:29 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit f4dd70840fd081f31076cf0c6d93be10c5b38e07
Merge: 3230790 677995d
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 24 13:37:10 2016 -0700
Merge branch 'next' into next-qt5
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)