# HG changeset patch
# User teknolog
# Date 1272444687 -3600
# Node ID bcd88ba95046ae6a4608076cdf3bd7a1cde694e6
# Parent  4a8c3b044a7cc5fc62242c6528633fd0fd993a32# Parent  3a22449b5c73a6fdaf6d531d2a44d8db9048dd1e
merge with Symbian3 branch

diff -r 4a8c3b044a7c -r bcd88ba95046 application/data/PodcastClient_english.rls
diff -r 4a8c3b044a7c -r bcd88ba95046 application/data/PodcastStrings.ra
diff -r 4a8c3b044a7c -r bcd88ba95046 application/data/images/Audio_downloading.svg
diff -r 4a8c3b044a7c -r bcd88ba95046 application/data/images/Audio_queued.svg
diff -r 4a8c3b044a7c -r bcd88ba95046 application/data/images/Audio_suspended.svg
diff -r 4a8c3b044a7c -r bcd88ba95046 application/group/Podcast.mmp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/inc/PodcastAppui.h
diff -r 4a8c3b044a7c -r bcd88ba95046 application/inc/PodcastFeedView.h
diff -r 4a8c3b044a7c -r bcd88ba95046 application/inc/PodcastListView.h
diff -r 4a8c3b044a7c -r bcd88ba95046 application/inc/PodcastShowsView.h
diff -r 4a8c3b044a7c -r bcd88ba95046 application/sis/podcatcher_udeb.sis
diff -r 4a8c3b044a7c -r bcd88ba95046 application/sis/podcatcher_udeb_signed.sis
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastAppui.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastFeedView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastListView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastQueueView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastSearchView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastSettingsView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 application/src/PodcastShowsView.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/group/engine.mmp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/inc/ConnectionEngine.h
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/inc/FeedEngine.h
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/inc/PodcastModel.h
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/inc/ShowEngine.h
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/ConnectionEngine.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/FeedEngine.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/OpmlParser.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/PodcastModel.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/SettingsEngine.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 engine/src/ShowEngine.cpp
diff -r 4a8c3b044a7c -r bcd88ba95046 group/bld.inf