summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/addon/MergeFiles.py
Commit message (Expand)AuthorAgeFilesLines
* Fix plugins key attributesGravatar Walter Purcaro 2014-12-101-7/+7
* Revert plugin directory structureGravatar Walter Purcaro 2014-12-101-2/+2
* Fix previous mergeGravatar Walter Purcaro 2014-12-101-6/+0
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-12-101-33/+41
* Update plugins after mergingGravatar Walter Purcaro 2014-11-151-1/+1
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-11-131-7/+14
* Merge branch 'stable' into 0.4.10Gravatar Walter Purcaro 2014-10-071-2/+2
* Update pyload to the new plugins structureGravatar Walter Purcaro 2014-10-031-3/+3
* Rename hooks directory to addonGravatar Walter Purcaro 2014-10-031-0/+76