From c46b882d9124fab8795b6094d928e76f6d21ae8c Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 11 Apr 2014 11:55:03 +0200 Subject: Fix __description__ Merges vuolter/pyload@74bcc70 (cherry picked from commit cca4127f9853ab029cbf0b55fedced124400952d) Conflicts: module/plugins/Account.py module/plugins/Container.py module/plugins/Crypter.py module/plugins/Hook.py module/plugins/Plugin.py module/plugins/container/LinkList.py pyload/plugins/crypter/HoerbuchIn.py --- pyload/plugins/addons/MergeFiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyload/plugins/addons/MergeFiles.py') diff --git a/pyload/plugins/addons/MergeFiles.py b/pyload/plugins/addons/MergeFiles.py index e7f35d406..770a47060 100644 --- a/pyload/plugins/addons/MergeFiles.py +++ b/pyload/plugins/addons/MergeFiles.py @@ -31,7 +31,7 @@ BUFFER_SIZE = 4096 class MergeFiles(Hook): __name__ = "MergeFiles" __version__ = "0.12" - __description__ = "Merges parts splitted with hjsplit" + __description__ = """Merges parts splitted with hjsplit""" __config__ = [("activated", "bool", "Activated", "False")] __threaded__ = ["packageFinished"] __author_name__ = "and9000" -- cgit v1.2.3