[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: |
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 next
in repository gnuradio.
commit b3254e51f8c7338429a5de65c7d07f7e6bc40af5
Merge: 2d02997 5cb307e
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 12 08:54:56 2015 -0800
Merge branch 'master' into next
cmake/Modules/FindUHD.cmake | 6 +++---
gr-qtgui/grc/qtgui_entry.xml | 2 +-
gr-uhd/CMakeLists.txt | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)