Merge branch 'master' into sync
authorTom <trondeau@vt.edu>
Tue, 6 Oct 2009 17:40:39 +0000 (10:40 -0700)
committerTom <trondeau@vt.edu>
Tue, 6 Oct 2009 17:40:39 +0000 (10:40 -0700)
commitbbd3df51732b2b63ae9d20e9fddd12229cf6b2ef
treedbf63fb638238e389ad970f2f4443299491e8fc6
parent314726ae7457b37f442a2751285b75b0d616c0f4
parent3f8026a00c261c788357b3a04f5b338a6cda4d0e
Merge branch 'master' into sync

Conflicts:
gr-utils/src/python/gr_plot_qt.py
gr-utils/src/python/pyqt_plot.py
gr-utils/src/python/pyqt_plot.ui
gr-utils/src/python/pyqt_plot.py