summaryrefslogtreecommitdiffstats
path: root/pyload/plugin/internal
diff options
context:
space:
mode:
authorGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-30 19:44:58 +0200
committerGravatar Walter Purcaro <vuolter@users.noreply.github.com> 2015-04-30 19:44:58 +0200
commit6305978099142fbe306d308877946c570fb4e98f (patch)
tree4264f9e17179e2aa26775c6dd448576d6c628ddf /pyload/plugin/internal
parentRevert colored console (diff)
parentSpare code cosmetics (diff)
downloadpyload-6305978099142fbe306d308877946c570fb4e98f.tar.xz
Merge branch 'stable' into 0.4.10
Conflicts: pyload/plugin/crypter/FilecryptCc.py pyload/plugin/hoster/Ftp.py pyload/plugin/hoster/UpleaCom.py pyload/plugin/hoster/UploadedTo.py pyload/plugin/internal/BasePlugin.py pyload/plugin/internal/SimpleHoster.py
Diffstat (limited to 'pyload/plugin/internal')
-rw-r--r--pyload/plugin/internal/BasePlugin.py2
-rw-r--r--pyload/plugin/internal/SimpleHoster.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/internal/BasePlugin.py b/pyload/plugin/internal/BasePlugin.py
index 996dc8e76..c5fbde8bb 100644
--- a/pyload/plugin/internal/BasePlugin.py
+++ b/pyload/plugin/internal/BasePlugin.py
@@ -13,7 +13,7 @@ from pyload.plugin.Hoster import Hoster
class BasePlugin(Hoster):
__name = "BasePlugin"
__type = "hoster"
- __version = "0.41"
+ __version = "0.42"
__pattern = r'^unmatchable$'
diff --git a/pyload/plugin/internal/SimpleHoster.py b/pyload/plugin/internal/SimpleHoster.py
index 75970d814..8b53559e7 100644
--- a/pyload/plugin/internal/SimpleHoster.py
+++ b/pyload/plugin/internal/SimpleHoster.py
@@ -244,7 +244,7 @@ def secondsToMidnight(gmt=0):
class SimpleHoster(Hoster):
__name = "SimpleHoster"
__type = "hoster"
- __version = "1.38"
+ __version = "1.39"
__pattern = r'^unmatchable$'
__config = [("use_premium", "bool", "Use premium account if available", True)]