[Commit-gnuradio] [gnuradio] branch master updated (f08f0f2 -> 5ab2370)

[git]

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

jcorgan pushed a change to branch master
in repository gnuradio.

      from  f08f0f2   vocoder: cleaned up documentation (removed warning on 
trademark symbol)
       new  1e0c15b   Windows compatibility fixes
       new  0bb63c7   Merge remote-tracking branch 'ncorgan/master_win_compat'
       new  f3408f8   wxgui: fix bug where grc_gnuradio files aren't added to 
NSIS installers
       new  0922993   Merge remote-tracking branch 'ncorgan/wxgui_win32_cpack' 
into maint
       new  5ab2370   Merge branch 'maint'

The 5 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:
 CMakeLists.txt              | 26 +++++++++++++++++++++-----
 gr-wxgui/grc/CMakeLists.txt |  4 ++--
 volk/lib/CMakeLists.txt     | 19 ++++++++++++++++---
 volk/lib/volk_malloc.c      |  4 ++++
 4 files changed, 43 insertions(+), 10 deletions(-)