[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'mmueller/freq_phase_mod_honest_signatures'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e1e4cc4c82cb8f87b438e225cfdfa5a80a0de6f9
Merge: a0794d5 3d4c742
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jul 6 16:00:57 2015 -0700

    Merge remote-tracking branch 'mmueller/freq_phase_mod_honest_signatures'

 gr-analog/include/gnuradio/analog/frequency_modulator_fc.h | 2 +-
 gr-analog/lib/frequency_modulator_fc_impl.cc               | 4 ++--
 gr-analog/lib/frequency_modulator_fc_impl.h                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)