Merge lp:~charclo-michael/entertainer/bug-228033-2 into lp:~entertainer-releases/entertainer/devel

[Charclo]

[Paul Hummer (rockstar)]

 M src/frontend/gui/tabs/tab.py
 M src/frontend/media_player.py
 M src/frontend/medialibrary/music.py
 M src/utils/lyrics_downloader.py
Text conflict in src/frontend/media_player.py
Text conflict in src/frontend/medialibrary/music.py
2 conflicts encountered.

[lp:~charclo-michael/entertainer/bug-228033-2]

228. By Charclo on 2008-06-07

resolved conflicts

229. By Charclo on 2008-06-08

Merged trunk and resolved new conflicts

[Paul Hummer (rockstar)]

Your branch looks good, and it could be even better by adding some tests. Lyrics fetching has been a sore spot that causes a lot of headache, and tests would help us catch problems early on. Please add those tests and I'll merge the branch in.

[lp:~charclo-michael/entertainer/bug-228033-2]

230. By Charclo on 2008-06-08

Added a unittest

[Paul Hummer (rockstar)]

I branched this branch and completed the work on the final unit test. It has been proposed for merging, and I will be merging it soon. Thanks for your work!