[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mmuell
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'mmueller/prefs_rewrite' |
|
Date: |
Mon, 16 May 2016 15:13:07 +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 681846ff4f16388482ed7c6fb2a53e31e553e6a2
Merge: 816c57e b37d9fd
Author: Johnathan Corgan <address@hidden>
Date: Mon May 16 07:56:48 2016 -0700
Merge remote-tracking branch 'mmueller/prefs_rewrite'
gnuradio-runtime/include/gnuradio/prefs.h | 3 +-
gnuradio-runtime/lib/prefs.cc | 137 ++++++++----------------------
2 files changed, 37 insertions(+), 103 deletions(-)