[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: |
Sun, 17 Aug 2014 22:03:13 +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 61e8088c9c29b15ef5f979f5e72336a878693b7f
Merge: b455112 f5cb616
Author: Johnathan Corgan <address@hidden>
Date: Sun Aug 17 15:00:11 2014 -0700
Merge branch 'master' into next
CMakeLists.txt | 3 +-
cmake/Modules/FindUHD.cmake | 108 ++++++++++++++++++++++++++---
gr-utils/python/modtool/modtool_makexml.py | 2 +-
gr-wxgui/python/wxgui/forms/forms.py | 4 +-
grc/gui/Actions.py | 2 +-
grc/gui/Bars.py | 2 +-
6 files changed, 104 insertions(+), 17 deletions(-)