Public Git Hosting - pyTivo/krkeegan.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: adabb8c 0ae4e36)

commit	bbe895788094b4d9202aca46d9b4a61d7b146db8
author	KRKeegan <-NOSPAM-kevin@krkeegan.com>
	Sun, 4 May 2008 04:21:41 +0000 (3 21:21 -0700)
committer	KRKeegan <-NOSPAM-kevin@krkeegan.com>
	Sun, 4 May 2008 04:21:41 +0000 (3 21:21 -0700)
tree	6d29c3e5c12e1af60d42504ceb93d6ebaddad7fc	tree \| snapshot (tar.gz zip)
parent	adabb8cdd5ac61bd270d852b1464cb1f5e1e2305	commit \| diff
parent	0ae4e36c95a171fca0d2206298cf979558b626b1	commit \| diff

Merge branch 'master' of git://repo.or.cz/pyTivo/wmcbrine into beta-push

Conflicts:

config.py
debug.py
plugins/admin/admin.py
plugins/video/transcode.py
plugins/video/video.py

config.py	diff1 \|	diff2 \|	blob \| history
httpserver.py	diff1 \|	diff2 \|	blob \| history
plugins/admin/admin.py	diff1 \|	diff2 \|	blob \| history
plugins/video/templates/container.tmpl	diff1 \|	diff2 \|	blob \| history
plugins/video/transcode.py	diff1 \|	diff2 \|	blob \| history
plugins/video/video.py	diff1 \|	diff2 \|	blob \| history

KRKeegan's Patches