| commit | c8f78cc508b06d88d29198f41f2f6033a3209efe | |
| author | wgw <tjm1100@gmail.com> | |
| Tue, 30 Dec 2008 07:04:21 +0000 (30 01:04 -0600) | ||
| committer | wgw <tjm1100@gmail.com> | |
| Tue, 30 Dec 2008 07:04:21 +0000 (30 01:04 -0600) | ||
| tree | 9138b8294e7c1fac61fefd7fd02c7718bedcc035 | treesnapshot (tar.gz zip) |
| parent | 0868f9365c1cb61c272d0dc205927b70333bddb9 | commitdiff |
| parent | 18eab9c39c5e9df1c6d94b61ca39e11bd33c34cb | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
Conflicts:
config.py
plugins/video/transcode.py
Conflicts:
config.py
plugins/video/transcode.py
| config.py | diff1 | diff2 | blobhistory |
| plugins/video/video.py | diff1 | diff2 | blobhistory |