[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 7e9137de246362608b695acadf8251a69f67fde0
Merge: a6c90dd 67baea5
Author: Johnathan Corgan <address@hidden>
Date:   Sat Sep 24 10:32:38 2016 -0700

    Merge branch 'maint'

 gr-fcd/lib/hid/hid-libusb.c | 117 +++++++++++--
 gr-fcd/lib/hid/hidapi.h     |  32 ++--
 gr-fcd/lib/hid/hidmac.c     | 406 +++++++++++++++++++++-----------------------
 gr-fcd/lib/hid/hidwin.c     | 355 ++++++++++++++++++++++----------------
 4 files changed, 532 insertions(+), 378 deletions(-)