[Commit-gnuradio] [gnuradio] 05/06: 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 7d50ee5b4c2fbc2c245dd2baa7c55f02c412b6c3
Merge: 7fad9ea f042e44
Author: Johnathan Corgan <address@hidden>
Date:   Sun Mar 22 08:05:29 2015 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/vmcircbuf.cc       |  5 ++---
 gnuradio-runtime/lib/vmcircbuf_prefs.cc | 16 +++++++---------
 gnuradio-runtime/lib/vmcircbuf_prefs.h  |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)