[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: |
Wed, 21 Jan 2015 18:26:48 +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 8d333546c2e5911ad02d7ef5962c7da83fd6194d
Merge: 547f98b 34c3136
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 21 10:22:16 2015 -0800
Merge branch 'master' into next
CMakeLists.txt | 7 +++++++
gnuradio-runtime/apps/gnuradio-config-info.cc | 24 +++++++++++++++---------
gnuradio-runtime/include/gnuradio/constants.h | 5 +++++
gnuradio-runtime/lib/CMakeLists.txt | 1 +
gnuradio-runtime/lib/constants.cc.in | 5 +++++
5 files changed, 33 insertions(+), 9 deletions(-)