From: Tom <trondeau@vt.edu>
Date: Tue, 6 Oct 2009 17:40:39 +0000 (-0700)
Subject: Merge branch 'master' into sync
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef;p=debian%2Fgnuradio

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
---

bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef
diff --cc gr-utils/src/python/pyqt_plot.py
index 3b8b4c9e,98977da9..5650135a
--- a/gr-utils/src/python/pyqt_plot.py
+++ b/gr-utils/src/python/pyqt_plot.py
@@@ -2,8 -2,8 +2,8 @@@
  
  # Form implementation generated from reading ui file 'pyqt_plot.ui'
  #
- # Created: Mon Aug 31 22:12:05 2009
 -# Created: Tue Sep  1 23:02:36 2009
 -#      by: PyQt4 UI code generator 4.4.3
++# Created: Tue Oct  6 10:39:58 2009
 +#      by: PyQt4 UI code generator 4.4.4
  #
  # WARNING! All changes made in this file will be lost!