| commit | 4fab8f80c789835f562985b959bf62de32165194 | |
| author | William McBrine <wmcbrine@gmail.com> | |
| Sun, 3 Feb 2008 02:24:21 +0000 (2 21:24 -0500) | ||
| committer | William McBrine <wmcbrine@gmail.com> | |
| Sun, 3 Feb 2008 02:24:21 +0000 (2 21:24 -0500) | ||
| tree | f9b228b4ec28bd2b0a4fdffd6947285a6345a7d1 | treesnapshot (tar.gz zip) |
| parent | 32b6c44ed9f76785b295521e22bb07f6336c8c76 | commitdiff |
| parent | 19219d5ab59e4ad7c29ff6feef707311a3bb3ba9 | commitdiff |
Merge git://repo.or.cz/pyTivo/wgw into wgw
Conflicts:
pyTivo.conf.dist
Conflicts:
pyTivo.conf.dist
| pyTivo.conf.dist | diff1 | diff2 | blobhistory |