[Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'garverp/tuntap_select'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 9544f661eb273c7693f6e6f5ce5e3a87e2e57ff4
Merge: 9ab772e 844d2d7
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 26 10:30:33 2015 -0800

    Merge remote-tracking branch 'garverp/tuntap_select'

 gr-blocks/grc/blocks_tuntap_pdu.xml            | 18 ++++++++++++++++--
 gr-blocks/include/gnuradio/blocks/tuntap_pdu.h |  3 ++-
 gr-blocks/lib/tuntap_pdu_impl.cc               | 17 ++++++++++++-----
 gr-blocks/lib/tuntap_pdu_impl.h                |  5 +++--
 4 files changed, 33 insertions(+), 10 deletions(-)