[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, 16 May 2016 15:13:08 +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 5c910950a0c872a52c8dc875b0c108c0f2609c30
Merge: 02b6805 681846f
Author: Johnathan Corgan <address@hidden>
Date: Mon May 16 08:02:29 2016 -0700
Merge branch 'master' into next
cmake/Modules/GrBoost.cmake | 1 +
gnuradio-runtime/include/gnuradio/prefs.h | 3 +-
gnuradio-runtime/lib/prefs.cc | 137 ++++++++----------------------
3 files changed, 38 insertions(+), 103 deletions(-)