Public Git Hosting - taboo.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b12394c 5e101a8)

commit	185858b04a4c5528329e0c025cfd16c11f7c624d
author	Ian Fischer <itfische@gmail.com>
	Sat, 21 Jul 2007 06:58:40 +0000 (20 23:58 -0700)
committer	Ian Fischer <itfische@gmail.com>
	Sat, 21 Jul 2007 06:58:40 +0000 (20 23:58 -0700)
tree	de7469762b0facb62718b38e14b9083d6fa030a5	tree \| snapshot (tar.gz zip)
parent	b12394ccce0c110b426a6a9515dc907810fce5c7	commit \| diff
parent	5e101a8e7d31669bda4b8397d5ec3bb04d268ef1	commit \| diff

Merge commit 'jesse/master'

Conflicts:

chrome/taboo/content/start.css
chrome/taboo/content/start.js

chrome/taboo/content/start.html	diff1 \|	diff2 \|	blob \| history
chrome/taboo/content/start.js	diff1 \|	diff2 \|	blob \| history

Taboo