| commit | d03625b44cb271689fb8c0625a6e0e6b1307e31b | |
| author | wgw <tjm1100@gmail.com> | |
| Wed, 7 Jan 2009 04:14:48 +0000 (6 22:14 -0600) | ||
| committer | wgw <tjm1100@gmail.com> | |
| Wed, 7 Jan 2009 04:14:48 +0000 (6 22:14 -0600) | ||
| tree | 66773b31dd17dde41fb4e79a5739fc70163c750a | treesnapshot (tar.gz zip) |
| parent | ee2786a4eacc7443bf7394d9f8b4a2614b46b339 | commitdiff |
| parent | c4edff44dee17c08cd8b7050b5ee891685c0fe3d | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
Conflicts:
config.py
plugins/admin/help.txt
plugins/video/templates/TvBus.tmpl
plugins/video/transcode.py
Conflicts:
config.py
plugins/admin/help.txt
plugins/video/templates/TvBus.tmpl
plugins/video/transcode.py
| plugins/video/templates/TvBus.tmpl | diff1 | diff2 | blobhistory |
| plugins/video/transcode.py | diff1 | diff2 | blobhistory |