[Commit-gnuradio] [gnuradio] 11/13: Merge remote-tracking branch 'pinkavaj/clear-int-00'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7288f02a04ad9cee6f0b9e830b3d43150f62092e
Merge: 92cecef 5c56ab7
Author: Johnathan Corgan <address@hidden>
Date:   Fri Apr 3 12:41:45 2015 -0700

    Merge remote-tracking branch 'pinkavaj/clear-int-00'
    
    Conflicts:
        volk

 gnuradio-runtime/include/gnuradio/fxpt.h         | 19 ++++++++++---------
 gnuradio-runtime/include/gnuradio/fxpt_vco.h     |  2 +-
 gnuradio-runtime/lib/math/qa_fxpt.cc             |  6 +++---
 gr-analog/lib/frequency_modulator_fc_impl.cc     |  2 +-
 gr-atsc/include/gnuradio/atsc/field_sync_demux.h |  4 ++--
 gr-audio/lib/alsa/alsa_sink.cc                   |  8 ++++----
 gr-audio/lib/alsa/alsa_source.cc                 |  8 ++++----
 gr-pager/lib/flex_parse_impl.cc                  |  4 ++--
 8 files changed, 27 insertions(+), 26 deletions(-)