Merge branch 'master' into next
Allocate 10 additional USB PIDs to Bdale.
Update details on Bdale's existing USB PID allocation.
Merge branch 'master' into constell_obj
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gr-audio-oss/src/Makefile.swig.gen gr-audio/swig/Makefile.swig.gen
usrp: cleanup misc usage
Merge branch 'master' of gnuradio.org:gnuradio
Fixing missing include files and various other patches for Windows build issues.
Fixing missing header file (in prep for future GCC's). ptrdiff_t is defined in stddef.h.
Removing docstring generation from this branch.
Also available in: