[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 02c998311434a65de301755f028752a65df83ac5
Merge: e0a70a9 cda1a59
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 26 19:24:58 2015 -0700

    Merge branch 'maint'

 gr-qtgui/grc/qtgui_number_sink.xml | 10 +++++-----
 volk                               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --cc volk
index 99594b1,264addc..f0b7223
--- a/volk
+++ b/volk
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 99594b123bffe1da562c8e6c333c9e67ab6a5956
 -Subproject commit 264addcc43db0669ecbd0cb1ab963c58617b6e6c
++Subproject commit f0b722392950bf7ede7b32f5ff60019bce7a8592