Merge remote branch 'nldudok1/gr-wxgui_emulate_analog' into master
authorJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 13 May 2010 19:29:59 +0000 (12:29 -0700)
committerJohnathan Corgan <jcorgan@corganenterprises.com>
Thu, 13 May 2010 19:29:59 +0000 (12:29 -0700)
commit331542fc51eb47a65161ab6d41c6dc8fd1dd1f22
tree98ac608fdb3349afdc8019fbdd9f7dcf49326b46
parent467678259c56fab32a326690cc01eac1dbcb48ca
parent49fa13f9fce2037d176c86bf326a7e25a78b72a5
Merge remote branch 'nldudok1/gr-wxgui_emulate_analog' into master

* nldudok1/gr-wxgui_emulate_analog:
  Add analog CRT screen afterglow emulation for gr-wxgui

Conflicts:
gr-wxgui/src/python/fftsink_gl.py
gr-wxgui/src/python/fftsink_nongl.py
gr-wxgui/src/python/constants.py
gr-wxgui/src/python/fft_window.py
gr-wxgui/src/python/fftsink_gl.py
gr-wxgui/src/python/fftsink_nongl.py
gr-wxgui/src/python/scope_window.py
gr-wxgui/src/python/scopesink_gl.py