Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
commitf1e76d8061669097cf6aae05d118690c87853181
authorKRKeegan <-NOSPAM-kevin@krkeegan.com>
Sat, 1 Mar 2008 22:50:27 +0000 (1 14:50 -0800)
committerKRKeegan <-NOSPAM-kevin@krkeegan.com>
Sat, 1 Mar 2008 22:50:27 +0000 (1 14:50 -0800)
treecad43ad344c7fe5e5311236730bf0bb040d5a906
parent9e1049b80cfb7d99386fcdf66c196ed23884e67a
parent0c8728dbb57185c05add98f3cc24b630ea94e413
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine
plugins/video/transcode.py
plugins/video/video.py