Merge branch 'master' of git://repo.or.cz/pyTivo/krkeegan
commit0d206fb80104d904c592e73eda47fc8fecc9b906
authorwgw <tjm1100@gmail.com>
Sat, 29 Mar 2008 09:32:03 +0000 (29 04:32 -0500)
committerwgw <tjm1100@gmail.com>
Sat, 29 Mar 2008 09:32:03 +0000 (29 04:32 -0500)
tree56eb43778445e7a18efd518c9a08584c6fab77bb
parentc07f9818ea65f1d26c0a7271c8844e36cee501e5
parent282db3cdb50bf8d84d62e12d676f94bafea78bb2
Merge branch 'master' of git://repo.or.cz/pyTivo/krkeegan
config.py
plugins/video/transcode.py