[Commit-gnuradio] [gnuradio] 05/13: Merge remote-tracking branch 'st0ne/maint' 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 95939b21e6a5405674a22a8ea03326accca50652
Merge: 689f507 b527f59
Author: Tom Rondeau <address@hidden>
Date:   Mon Nov 24 20:41:41 2014 -0500

    Merge remote-tracking branch 'st0ne/maint' into maint

 gnuradio-runtime/lib/math/fast_atan2f.cc          |  25 ++-
 gnuradio-runtime/lib/math/qa_fast_atan2f.cc       |  47 +++--
 gr-analog/python/analog/qa_pll_carriertracking.py | 200 +++++++++++-----------
 gr-analog/python/analog/qa_pll_freqdet.py         | 198 ++++++++++-----------
 gr-analog/python/analog/qa_pll_refout.py          | 198 ++++++++++-----------
 5 files changed, 331 insertions(+), 337 deletions(-)