Merge branch 'master' into 8psk
Conflicts: gr-qtgui/lib/qtgui_time_sink_c.cc gr-trellis/src/lib/Makefile.am gr-trellis/src/lib/calc_metric.h gr-trellis/src/lib/trellis.i gr-trellis/src/lib/trellis_constellation_metrics_cf.i gr-trellis/src/lib/trellis_metric_type.h...
qtgui: removed all traces of highResTimeFunctions.h
qtgui: partially switch to gruel high res timer
gr-qtgui: makes time sink a sync_block (since it is) and uses set_output_multiple instead of forecast. The result is that multiple streams maintain constant relationship, which they did not before. This should also prevent us from having to keep so much book-keeping of the indecies, and we will hopefully be able to clean this up soon.
qtgui: added GR_QTGUI_API declaration to qtgui library classes and functions
gr-qtgui: Adding float interface to qtgui_time_sink and example program.