[Commit-gnuradio] [gnuradio] branch next updated (f44ad38 -> db4b313)

[git]

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

trondeau pushed a change to branch next
in repository gnuradio.

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

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