[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, 16 Mar 2017 04:51:50 +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 407788da7d7a352c682310ae641ea81a898c8f8a
Merge: 29d3bf1 36ffcf5
Author: Johnathan Corgan <address@hidden>
Date: Wed Mar 15 21:42:53 2017 -0700
Merge branch 'master' into next
CMakeLists.txt | 6 ++++--
cmake/Modules/FindSWIG.cmake | 4 ++--
gnuradio-runtime/CMakeLists.txt | 10 ----------
3 files changed, 6 insertions(+), 14 deletions(-)