Public Git Hosting - gpodder.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 710cae7 fb42e0b)

commit	d13b7c8bc9458fbb772ba780c98a290ec98c8c23
author	Thomas Perl <m@thp.io>
	Wed, 2 Nov 2011 09:46:22 +0000 (2 10:46 +0100)
committer	Thomas Perl <m@thp.io>
	Wed, 2 Nov 2011 09:46:22 +0000 (2 10:46 +0100)
tree	161edf6028c57de4b7c36362bda22d7ae4392791	tree \| snapshot (tar.gz zip)
parent	710cae7e3514821ec943f9b0b29b528d1652f5c3	commit \| diff
parent	fb42e0b51bc4bad2e0668161a51fb055e6e5f27d	commit \| diff

Merge branch 'tres' into harmattan

data/ui/qml/Main.qml	diff1 \|	diff2 \|	blob \| history
data/ui/qml/MediaPlayer.qml	diff1 \|	diff2 \|	blob \| history
src/gpodder/qmlui/__init__.py	diff1 \|	diff2 \|	blob \| history

gPodder — simple, usable podcast consumption (mirror repository)