Public Git Hosting - pyTivo/TheBayer.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 3368ee6 5f6b8e0)

commit	79fd85b2b5af79da8923cbb833f37fb08d11316a
author	Eric von Bayer <tivo@tesseract.thetesseract.org>
	Thu, 18 Feb 2010 23:16:20 +0000 (18 15:16 -0800)
committer	Eric von Bayer <tivo@tesseract.thetesseract.org>
	Thu, 18 Feb 2010 23:16:20 +0000 (18 15:16 -0800)
tree	91ada73c345eeeea0eb9c9feb1918ebec5686d15	tree \| snapshot (tar.gz zip)
parent	3368ee6603c27e889203fe74bdfabca6c9e2e9a1	commit \| diff
parent	5f6b8e012d6e9d6bb50ad6245398e2ef2dfa7a8a	commit \| diff

Merge commit 'wmcbrine/master'

Conflicts:

httpserver.py
plugins/togo/templates/npl.tmpl
plugins/togo/togo.py
pyTivo.conf.dist

beacon.py	diff1 \|	diff2 \|	blob \| history
httpserver.py	diff1 \|	diff2 \|	blob \| history
metadata.py	diff1 \|	diff2 \|	blob \| history
plugins/togo/content/npl.css	\|	diff2 \|	blob \| history
plugins/togo/templates/npl.tmpl	diff1 \|	diff2 \|	blob \| history
plugins/togo/togo.py	diff1 \|	diff2 \|	blob \| history
pyTivo.conf.dist	diff1 \|	diff2 \|	blob \| history

TheBayer's Plugins and Enhancements