| commit | 10bf9e4e15a51c6a758fabefb75f6502b7809e09 | |
| author | Jason Michalski <armooo@armooo.net> | |
| Sun, 25 Nov 2007 08:02:38 +0000 (25 02:02 -0600) | ||
| committer | Jason Michalski <armooo@armooo.net> | |
| Sun, 25 Nov 2007 08:02:38 +0000 (25 02:02 -0600) | ||
| tree | 81b0a73877a5ceb67bfae4234f9ce4286ebe1778 | treesnapshot (tar.gz zip) |
| parent | 6f0816373f5a0f462c9c3d9a4208e386a41c2358 | commitdiff |
| parent | bf6c2415801df7a955be0005a917a6e635d978ca | commitdiff |
Merge branch 'master' into subfolders-8.3
Conflicts:
Config.py
plugin.py
plugins/music/music.py
plugins/video/transcode.py
plugins/video/video.py
pyTivo.conf
Conflicts:
Config.py
plugin.py
plugins/music/music.py
plugins/video/transcode.py
plugins/video/video.py
pyTivo.conf
| config.py | diff2 | blobhistory | |
| httpserver.py | diff1 | diff2 | blobhistory |
| plugins/video/transcode.py | diff1 | diff2 | blobhistory |
| plugins/video/video.py | diff1 | diff2 | blobhistory |