# HG changeset patch
# User teknolog
# Date 1272445595 -3600
# Node ID 9c24c921ec357c04033b1e0e49c24cdfbb6d357d
# Parent  bcd88ba95046ae6a4608076cdf3bd7a1cde694e6# Parent  bb78b150af5ef86248d273c7ddad3f3413e377e5
merge

diff -r bcd88ba95046 -r 9c24c921ec35 application/group/Podcast.mmp
diff -r bcd88ba95046 -r 9c24c921ec35 application/sis/podcatcher_udeb.sis
diff -r bcd88ba95046 -r 9c24c921ec35 application/sis/podcatcher_udeb_signed.sis
diff -r bcd88ba95046 -r 9c24c921ec35 application/sis/podcatcher_urel.sis
Binary file application/sis/podcatcher_urel.sis has changed
diff -r bcd88ba95046 -r 9c24c921ec35 application/sis/podcatcher_urel_signed.sis
Binary file application/sis/podcatcher_urel_signed.sis has changed
diff -r bcd88ba95046 -r 9c24c921ec35 application/src/PodcastFeedView.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 application/src/PodcastListView.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 application/src/PodcastQueueView.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 application/src/PodcastSearchView.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 application/src/PodcastShowsView.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 engine/src/FeedEngine.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 engine/src/PodcastModel.cpp
diff -r bcd88ba95046 -r 9c24c921ec35 engine/src/ShowEngine.cpp