[Commit-gnuradio] [gnuradio] branch master updated (8b16d52 -> 029079c)

[git]

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

trondeau pushed a change to branch master
in repository gnuradio.

      from  8b16d52   Merge branch 'maint'
      adds  ff7e74b   blocks: fixed relative rate in keep_m_in_n. It's m-in-n, 
not n-in-m.
       new  1b8f28c   Merge branch 'maint'
       new  b24801b   Fix to previous cmake fix for .s files
       new  48ab464   Merge remote-tracking branch 'dgeiger/cmake_fixes'
       new  029079c   volk: fixing up output message to print c flags and asm 
flags used by Volk next to each other.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gr-blocks/lib/keep_m_in_n_impl.cc | 6 +++---
 volk/lib/CMakeLists.txt           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)