[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: |
Thu, 2 Apr 2015 22:18:20 +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 f0076a4996c3f9a5a53f88a0413e434fe3968525
Merge: 2d56b22 04faaba
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 2 15:14:13 2015 -0700
Merge branch 'master' into next
cmake/Packaging/Fedora-15.cmake | 2 +-
cmake/Packaging/Fedora-16.cmake | 2 +-
cmake/Packaging/Fedora-17.cmake | 2 +-
cmake/Packaging/Fedora-18.cmake | 2 +-
docs/doxygen/other/build_guide.dox | 1 -
gr-qtgui/CMakeLists.txt | 1 -
gr-qtgui/doc/qtgui.dox | 1 -
gr-qtgui/grc/qtgui_range.xml | 130 ++---------------------------
gr-qtgui/python/qtgui/CMakeLists.txt | 1 +
gr-qtgui/python/qtgui/__init__.py | 3 +
gr-qtgui/python/qtgui/range.py | 157 +++++++++++++++++++++++++++++++++++
11 files changed, 173 insertions(+), 129 deletions(-)