Michael Vogel d653e27e2d Merge commit 'upstream/master' ... Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl		2012-03-11 20:22:28 +01:00
..
clean
darkbubble
darkness
darkzero	Merge branch 'pull'	2012-03-05 18:52:15 -08:00
darkzero-NS
diabook	Merge commit 'upstream/master'	2012-03-11 20:22:28 +01:00
diabook-blue	fixed login-fields, fixed. notofication.png, changed locations	2012-03-10 13:22:41 +01:00
dispy	add some '@media handheld' types for dispys	2012-03-11 10:24:49 -04:00
dispy-dark	screwed up on the font-size for screen last push	2012-03-11 10:29:12 -04:00
duepuntozero	some testbubble stuff	2012-03-05 15:58:26 -08:00
easterbunny
goldenrod
greenzero
loozah
purplezero
quattro	quattro: theme settings (a bit hackish)	2012-03-06 09:50:18 +01:00
quattro-green
shady
slackr
testbubble	theme info file for testbubble	2012-03-08 16:30:45 -08:00
three-d
vier