summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/addons/MergeFiles.py
Commit message (Expand)AuthorAgeFilesLines
* Remove bad whitespacesGravatar Walter Purcaro 2014-04-211-1/+1
* Fix __config__Gravatar Walter Purcaro 2014-04-211-1/+1
* Fix __description__Gravatar Walter Purcaro 2014-04-211-1/+1
* Fix __author_name__ and __author_mail__Gravatar Walter Purcaro 2014-04-211-2/+2
* Merge remote-tracking branch 'origin/stable'Gravatar RaNaN 2013-11-171-2/+2
* Merge pull request #218 from vuolter/s/plugin/coreconfigGravatar Stefano 2013-09-241-3/+3
* Fixed PEP 8 violations in HooksGravatar Stefano 2013-07-241-11/+7
* Merge plugins from stableGravatar Stefano 2013-07-201-5/+5
* moved everything from module to pyloadGravatar RaNaN 2013-06-091-0/+94