[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
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-qt5
in repository gnuradio.
commit d7be06ce2b521b4d262c340d07520d8e883a5478
Merge: 1b3e191 5c91095
Author: Johnathan Corgan <address@hidden>
Date: Mon May 16 08:09:57 2016 -0700
Merge branch 'next' into next-qt5
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(-)