James Lu afc8d828b2 Merge remote-tracking branch 'origin/patch-1' into drivers/logging ...

Conflicts:
	src/drivers/Socket.py

2016-02-24 07:07:29 -08:00

..

__init__.py

Remove a driver from the list of dead drivers after it has been restarted. Closes GH-1165.

2016-02-09 17:31:39 +00:00

Socket.py

Merge remote-tracking branch 'origin/patch-1' into drivers/logging

2016-02-24 07:07:29 -08:00

Twisted.py

core: Apply some suggestions of pyflakes.

2015-08-31 18:19:22 +02:00