diff options
author | 2016-01-30 03:04:52 +0100 | |
---|---|---|
committer | 2016-01-30 03:04:52 +0100 | |
commit | c6ba3ae11f9296108a297fc78ae68f3c8461a3da (patch) | |
tree | d2cec1679a3fad86c114867037ba29e5fd97d0c1 /module/plugins/hooks/MergeFiles.py | |
parent | [ClickNLoad] Fix false reporting of unclean shutdown on python 2.5 (diff) | |
download | pyload-c6ba3ae11f9296108a297fc78ae68f3c8461a3da.tar.xz |
[misc] Move `threaded`, `Expose` form Addon to misc
Diffstat (limited to 'module/plugins/hooks/MergeFiles.py')
-rw-r--r-- | module/plugins/hooks/MergeFiles.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/plugins/hooks/MergeFiles.py b/module/plugins/hooks/MergeFiles.py index 963f8c15b..ed3758443 100644 --- a/module/plugins/hooks/MergeFiles.py +++ b/module/plugins/hooks/MergeFiles.py @@ -5,14 +5,14 @@ from __future__ import with_statement import os import re -from module.plugins.internal.Addon import Addon, threaded -from module.plugins.internal.misc import fsjoin +from module.plugins.internal.Addon import Addon +from module.plugins.internal.misc import fsjoin, threaded class MergeFiles(Addon): __name__ = "MergeFiles" __type__ = "hook" - __version__ = "0.19" + __version__ = "0.20" __status__ = "testing" __config__ = [("activated", "bool", "Activated", True)] |