[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Sat, 12 Dec 2015 04:18:58 +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 2c85dbb2ac707daf5512276bc777d8eb8417ddf9
Merge: bb954cd 8c42ed2
Author: Johnathan Corgan <address@hidden>
Date: Fri Dec 11 19:58:29 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/py_feval.h | 1 -
gnuradio-runtime/include/gnuradio/sys_pri.h | 10 +++++-----
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 2 ++
gr-vocoder/gnuradio-vocoder.pc.in | 2 +-
gr-vocoder/include/gnuradio/vocoder/codec2.h | 2 +-
gr-vocoder/lib/CMakeLists.txt | 7 -------
gr-vocoder/swig/CMakeLists.txt | 1 -
7 files changed, 9 insertions(+), 16 deletions(-)