[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mbr0wn
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mbr0wn/uhd/siggen_gui' |
|
Date: |
Thu, 24 Sep 2015 23:53:52 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit e0291bf0be990a3afc098b918777bb09156f9c79
Merge: 70f2d89 5fe360c
Author: Johnathan Corgan <address@hidden>
Date: Thu Sep 24 16:40:45 2015 -0700
Merge remote-tracking branch 'mbr0wn/uhd/siggen_gui'
gr-uhd/apps/CMakeLists.txt | 1 +
gr-uhd/apps/uhd_app.py | 292 +++++
gr-uhd/apps/uhd_siggen | 34 +-
gr-uhd/apps/uhd_siggen_base.py | 351 ++----
gr-uhd/apps/uhd_siggen_gui | 689 ++++++----
gr-uhd/examples/grc/uhd_siggen_gui.grc | 2154 ++++++++++++++++++++++++++++++++
6 files changed, 2994 insertions(+), 527 deletions(-)