Deluge
diff options
| author | Pedro Algarvio <ufs@ufsoft.org> | 2010-12-13 12:31:20 +0000 |
|---|---|---|
| committer | Pedro Algarvio <ufs@ufsoft.org> | 2010-12-13 12:31:20 +0000 |
| commit | 2fa8ca67534525ca8fe9c06c380e205647711e0c (patch) | |
| tree | 5517c294b153bc4c0ed7bcd5f86241c6f89be0d8 /deluge/log.py | |
| parent | eeed72a977e3798f30324a397436a6318e2f5ed1 (diff) | |
| parent | 1c15df8e00d6db9f4cfe7ac913ff3ae13c72033b (diff) | |
| download | deluge-2fa8ca67534525ca8fe9c06c380e205647711e0c.tar.gz deluge-2fa8ca67534525ca8fe9c06c380e205647711e0c.tar.bz2 deluge-2fa8ca67534525ca8fe9c06c380e205647711e0c.zip | |
Merge branch 'master' into improved-logging
Conflicts:
ChangeLog
deluge/plugins/autoadd/autoadd/gtkui.py
deluge/ui/client.py
Diffstat (limited to 'deluge/log.py')
0 files changed, 0 insertions, 0 deletions