[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'maint' |
|
Date: |
Mon, 12 Jan 2015 16:58:57 +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 5cb307e6f347cf2cb15990848040f7c743c271e5
Merge: f0cd504 a2107f7
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 12 08:53:16 2015 -0800
Merge branch 'maint'
cmake/Modules/FindUHD.cmake | 6 +++---
gr-qtgui/grc/qtgui_entry.xml | 2 +-
gr-uhd/CMakeLists.txt | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)