diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2013-09-27 17:30:34 -0700 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2013-09-27 17:30:34 -0700 |
commit | cba4c68365fe17dfd6a7cb5146821f7333b07bd1 (patch) | |
tree | 5399f98335abd5a4a31248f9ff7658f32a6d96f3 /demos/demo.py | |
parent | 5c124cb1362f08296802f8d4856eaa18c0b35b00 (diff) | |
parent | 7243f8fe90097eb3c78db0b31a19104155b9cf89 (diff) |
Merge branch '1.11' into 156-int
Diffstat (limited to 'demos/demo.py')
-rwxr-xr-x | demos/demo.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/demo.py b/demos/demo.py index 05524d3c..c21a926e 100755 --- a/demos/demo.py +++ b/demos/demo.py @@ -26,7 +26,6 @@ import os import select import socket import sys -import threading import time import traceback |