regenerated from template
rearrange includes to always be: internal GR, external, with GR.
Merge branch 'maint'
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Fixed gitignore to reflect changes in moc/ui file naming.
Fixes a lot of warnings by cleaning up namespace issues.
Removing qwtplot3d dependency and fixing a missed include in waterfallGlobalData.h.
Also available in: