Merge branch 'harmattan' of gitorious.org:maelyrica/maelyrica
authorMarcin Mielniczuk <marmistrz@linux.pl>
Thu, 16 Aug 2012 16:50:43 +0000 (18:50 +0200)
committerMarcin Mielniczuk <marmistrz@linux.pl>
Thu, 16 Aug 2012 16:50:43 +0000 (18:50 +0200)
commit5fb4f96205cc9ccc652e5423824506de6835cd55
tree283cb1a3113350a29eab9cddf100a3575cb02c24
parent0c1c2a8e93a84a8e2879e05cfaba8ea58b6fcfbf
parent806328fa3a2c1bcc58cae67c6edc3979a1d13bc4
Merge branch 'harmattan' of gitorious.org:maelyrica/maelyrica
qml/maelyrica/ShowLyricsPage.qml