Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'stable' into 0.4.10 | 2014-11-22 | 1 | -77/+75 | |
| | | | | | | | | | | | Conflicts: module/PluginThread.py pyload/plugins/Plugin.py pyload/plugins/hoster/RarefileNet.py pyload/plugins/internal/MultiHoster.py pyload/plugins/internal/SimpleCrypter.py pyload/plugins/internal/SimpleHoster.py pyload/plugins/internal/XFSHoster.py | ||||
* | Merge branch 'stable' into 0.4.10 | 2014-11-21 | 1 | -5/+6 | |
| | | | | | | | | | Conflicts: pyload/network/HTTPRequest.py pyload/plugins/account/UlozTo.py pyload/plugins/crypter/LinkCryptWs.py pyload/plugins/internal/SimpleCrypter.py pyload/plugins/internal/SimpleHoster.py | ||||
* | Update plugins 2 | 2014-11-15 | 1 | -2/+2 | |
| | |||||
* | Update plugins after merging | 2014-11-15 | 1 | -0/+345 | |