[Commit-gnuradio] [gnuradio] 03/03: Merge branch 'maint' of git.gnuradio.org:gnuradio into maint

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit 5c3c34544248e1fa9aec8733012ea968acd03498
Merge: 1fa94d7 31c1d39
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 25 18:00:20 2014 -0400

    Merge branch 'maint' of git.gnuradio.org:gnuradio into maint

 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(-)