Public Git Hosting - pyTivo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3e30eab dedb278)

commit	a48d9d67db45fecd1076dbe30dff527154bd5907
author	KRKeegan <-NOSPAM-kevin@krkeegan.com>
	Mon, 24 Mar 2008 00:50:40 +0000 (23 17:50 -0700)
committer	KRKeegan <-NOSPAM-kevin@krkeegan.com>
	Mon, 24 Mar 2008 00:50:40 +0000 (23 17:50 -0700)
tree	1c82f099d9006c8c7a26153b5712b759d3065ec2	tree \| snapshot (tar.gz zip)
parent	3e30eab225fcd1b32e96863039a6f49eccc9cbc3	commit \| diff
parent	dedb2786d102cab26bb80b3707b2bb34c2021644	commit \| diff

Merge branch 'master' of git://repo.or.cz/pyTivo/wgw

plugins/admin/admin.py	diff1 \|	diff2 \|	blob \| history
plugins/admin/templates/settings.tmpl	diff1 \|	diff2 \|	blob \| history

pyTivo lets you stream most videos from your PC to your unhacked TiVo