| commit | a831e6c85be8b9206c651b1bcb674f6beba51686 | |
| author | William McBrine <wmcbrine@gmail.com> | |
| Mon, 31 Dec 2007 19:19:30 +0000 (31 14:19 -0500) | ||
| committer | William McBrine <wmcbrine@gmail.com> | |
| Mon, 31 Dec 2007 19:19:30 +0000 (31 14:19 -0500) | ||
| tree | 93049acd1efac0e4b8c200f8b67a4d22783a66c1 | treesnapshot (tar.gz zip) |
| parent | 7de2d3c8e498571b5a3c07d917f6357bca7d26c1 | commitdiff |
| parent | 159e96c6b9062af53a48732ca3c0f72be77a40a7 | commitdiff |
Merge branch 'master' of git://armooo.net/pyTivo
Conflicts:
plugin.py
Re-syncing... hope I'm doing this right. Anyway, this reapplies the changes thatallow handling of lists of objects as well as strings.
Conflicts:
plugin.py
Re-syncing... hope I'm doing this right. Anyway, this reapplies the changes thatallow handling of lists of objects as well as strings.