| commit | 2f1f223bd62e30a4774828a3c811b1194e18b703 | |
| author | lucas_nz <lucas_nz@hotmail.com> | |
| Sun, 6 Jul 2014 10:04:48 +0000 (6 22:04 +1200) | ||
| committer | lucas_nz <lucas_nz@hotmail.com> | |
| Sun, 6 Jul 2014 10:04:48 +0000 (6 22:04 +1200) | ||
| tree | 86b869cbaa66ab9ae6e8243379bc23f65c85ef00 | treesnapshot (tar.gz zip) |
| parent | a8555aab450c13996863c8ebc0166a8ea8d510bb | commitdiff |
| parent | 2bce1dd62eb2d3812406fb878a7e6b81052a4c31 | commitdiff |
Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine.git
Conflicts:
config.py
plugins/togo/togo.py
plugins/video/transcode.py
Conflicts:
config.py
plugins/togo/togo.py
plugins/video/transcode.py
| plugins/togo/togo.py | diff1 | diff2 | blobhistory |