[Commit-gnuradio] [gnuradio] 05/08: Merge remote-tracking branch 'osh/qtgui_msg_tags'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0b6947ee96d5a74f4c4d4816ed19a277128410e5
Merge: f93f2ef 0dafca4
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 25 10:09:38 2016 -0700

    Merge remote-tracking branch 'osh/qtgui_msg_tags'

 gr-qtgui/lib/time_sink_c_impl.cc | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)