[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: |
Thu, 24 Jul 2014 17:09:13 +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 282b1c48240de554442bfcbfee6533e407b16a1e
Merge: a9cf4ab a7a7183
Author: Johnathan Corgan <address@hidden>
Date: Thu Jul 24 10:06:43 2014 -0700
Merge branch 'master' into next
cmake/Modules/FindPortaudio.cmake | 6 +++---
cmake/Modules/GrComponent.cmake | 5 ++---
gr-digital/lib/CMakeLists.txt | 1 -
gr-vocoder/lib/codec2/quantise.c | 14 +++++++-------
4 files changed, 12 insertions(+), 14 deletions(-)