summaryrefslogtreecommitdiffstats
path: root/MANIFEST.in
diff options
context:
space:
mode:
authorChase Sterling <chase.sterling@gmail.com>2013-02-10 17:30:25 -0500
committerChase Sterling <chase.sterling@gmail.com>2013-02-10 17:30:25 -0500
commit8c106ce8c4c0794ddd63e8e8f98b097221a56a52 (patch)
tree45944ea2333b4da97045ccefed2ed5e1de3ac321 /MANIFEST.in
parentb4f5e78a775503a5501e2eba7eee73dfa0e1955a (diff)
parentfbdda1b3a5db6203f1993a03eed92ca489903aab (diff)
downloaddeluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.tar.gz
deluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.tar.bz2
deluge-8c106ce8c4c0794ddd63e8e8f98b097221a56a52.zip
Merge remote-tracking branch 'bro/master-daemon-optimize-speed'
Conflicts: deluge/core/alertmanager.py deluge/core/torrentmanager.py
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions