| commit | 9e1dedc3233bae5f3853bc4c8710691422976108 | |
| author | William McBrine <wmcbrine@gmail.com> | |
| Thu, 10 Jan 2008 09:18:22 +0000 (10 04:18 -0500) | ||
| committer | William McBrine <wmcbrine@gmail.com> | |
| Thu, 10 Jan 2008 09:18:22 +0000 (10 04:18 -0500) | ||
| tree | d94ff5a528d7db6f316103da93292a233398b8ca | treesnapshot (tar.gz zip) |
| parent | 433b7e73b79ec241f0d36ad42d2cded9524fbe14 | commitdiff |
| parent | 1a0647eeb101f2a483c2f8f720989d5ca01bb29b | commitdiff |
Merge git://repo.or.cz/pyTivo/krkeegan into krkeegan
Conflicts:
plugin.py
Conflicts:
plugin.py
| plugins/video/video.py | diff1 | diff2 | blobhistory |