[Commit-gnuradio] [gnuradio] 04/07: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 3924c9fc08d8fc285d119d78c068727f6d2e5bce
Merge: 2e691d8 d10b68f
Author: Tom Rondeau <address@hidden>
Date:   Wed Aug 13 17:21:58 2014 -0400

    Merge branch 'maint'

 .../python/modtool/gr-newmod/python/__init__.py    |  24 ----
 volk/lib/CMakeLists.txt                            |  12 ++
 volk/lib/volk_malloc.c                             | 122 ++++++---------------
 3 files changed, 47 insertions(+), 111 deletions(-)