gr-uhd: add option to uhd_rx_cfile to write metadata file.
Support for >1 jack port, various sizes of jack buffers
GNU Radio EXPAND macros for template files:
+ move the 3 EXPAND macros to a common place (GrMiscUtils);
+ use them, or remove the unnecessary code when not actually using;
+ modify EXPAND macros to do the expansion at configure time, build time, and any time a dependency has been modified.
docs: fixed doxygen since fec_generated_includes no longer exists.
qtgui: more fixes needed to turn on/off python properly for sip calls.
Merge branch 'maint'
digital: if pre_diff_code is not used, use [0, M-1] as the code in soft decison calculation.
volk: volk_profile.cc: Parse command line options in try/catch block

CID 1138358: Add try/catch block to parsing
volk: cleaned up 32fc_x2_dot_prod_32fc code. Improved results; fixed on OS X.

- Added unaligned versions of kernels.
- Fixed issues with tail handling
- Use _mm_setzero_ps instead of subtracting to zero out values
volk: fixed issue with size_t comparison of std::string function (compare against std::npos, not -1).
Merge branch 'maint'
qtgui: enables use of QWT 6.1.
Revert "GNU Radio EXPAND macros for template files:"

This reverts commit 6fc200fcba65cc4d18d7b10381da72769c0183c4.

The original commit causes excessive rebuild sensitivity by
regenerating many public API header files at cmake time instead
of at build time.
filter: fixed issue with resampler using buffer size information (always a mistake).

The intent was to ask the scheduler for the maximum amount of data. Now, it plays it safe by asking for just enough the next time. Performance tests show it works well.
qtgui: enables use of QWT 6.1.
Merge branch 'master' of git.gnuradio.org:gnuradio
Merge branch 'maint'
qtgui: fixing file mixup when merging maint->master.
cmake: allow the GR_REQUIRED_COMPONENTS to contain VOLK when using GnuradioConfig.cmake interface
volk: fixed volk build to be independent (again) from GR.

Should rename GrPython.cmake to VolkPython.cmake.