[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint' |
|
Date: |
Mon, 27 Jan 2014 20:10:38 +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 82117860cd10a74ff6205be68a6f30c1564e6bce
Merge: fa32b7b 30c7c0e
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 27 11:33:05 2014 -0800
Merge branch 'maint'
cmake/Modules/FindQwt.cmake | 4 ++--
docs/doxygen/other/group_defs.dox | 2 +-
docs/sphinx/source/blocks/networking_tools_blk.rst | 4 ++--
gr-trellis/examples/python/README | 2 +-
gr-uhd/lib/usrp_source_impl.cc | 10 +++++++---
gr-uhd/lib/usrp_source_impl.h | 5 ++++-
grc/gui/MainWindow.py | 6 ++----
7 files changed, 19 insertions(+), 14 deletions(-)
- [Commit-gnuradio] [gnuradio] branch master updated (3fa56a4 -> 8211786), git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'gnuradio-wg-grc/grc_xml_error_dialog', git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 05/07: grc: renaming flowgraph errors menu item and xml parser action, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint',
git <=
- [Commit-gnuradio] [gnuradio] 04/07: grc: show xml parser error warning in report window, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 02/07: grc: xml parser errors dialog fixes and refactoring, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 01/07: grc: adding a page that captures and stores some XML parsing errors, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 03/07: grc: detect block (category) tree files by name (not by trail and error), git, 2014/01/27