Merge after removal of incorrect RCL_3 drop RCL_3
authorandy simpson <andrews@symbian.org>
Thu, 02 Sep 2010 15:47:07 +0100
branchRCL_3
changeset 67 1539a383d7b6
parent 62 240da2698c91 (current diff)
parent 66 bd7edf625bdd (diff)
child 73 c229870c2077
Merge after removal of incorrect RCL_3 drop
alarmengines/missedalarmstore/rom/missedalarmstore.iby
alarmengines/missedalarmstore/src/missedalarmstore.cpp
alarmui/group/alarmui_snooze.rul
calendarengines/calenlauncher/src/CalenLauncherImpl.cpp
calendarengines/group/bld.inf
calendarui/application/data/CalenSettings.ra
calendarui/application/data/Calendar.rss
calendarui/application/group/Calendar.mmp
calendarui/application/group/iconlist.txt
calendarui/calenaiwprovider/group/calenaiwprovider.mmp
calendarui/calenaiwprovider/src/calenaiwprovider.cpp
calendarui/cenrep/CalendarInternalCRKeys.h
calendarui/commonutils/group/commonutils.mmp
calendarui/commonutils/inc/CalenStatusPaneUtilsImpl.h
calendarui/commonutils/inc/calenattachmentinfo.h
calendarui/commonutils/inc/calenattachmentmodel.h
calendarui/commonutils/inc/calencustomnavilabel.h
calendarui/commonutils/src/CalenStatusPaneUtils.cpp
calendarui/commonutils/src/CalenStatusPaneUtilsImpl.cpp
calendarui/commonutils/src/calenactionuiutils.cpp
calendarui/commonutils/src/calenattachmentinfo.cpp
calendarui/commonutils/src/calenattachmentmodel.cpp
calendarui/commonutils/src/calenattachmentutils.cpp
calendarui/commonutils/src/calencustomnavilabel.cpp
calendarui/commonutils/src/calenentryutil.cpp
calendarui/commonutils/src/calenviewutils.cpp
calendarui/controller/data/calencommonui.rss
calendarui/controller/group/calencontroller.mmp
calendarui/controller/inc/calenattachmentui.h
calendarui/controller/inc/calencmdlinelauncher.h
calendarui/controller/inc/calenicons.h
calendarui/controller/inc/calenlocationui.h
calendarui/controller/inc/calenmultidbeditor.h
calendarui/controller/inc/calenmultipledbui.h
calendarui/controller/inc/calentoolbarimpl.h
calendarui/controller/inc/calenviewattachmentsdialog.h
calendarui/controller/src/calenalarmmanager.cpp
calendarui/controller/src/calenattachmentui.cpp
calendarui/controller/src/calencmdlinelauncher.cpp
calendarui/controller/src/calencmdlineparser.cpp
calendarui/controller/src/calencontextfwlistener.cpp
calendarui/controller/src/calenicons.cpp
calendarui/controller/src/calenlocationui.cpp
calendarui/controller/src/calenmapstate.cpp
calendarui/controller/src/calenmultidbeditor.cpp
calendarui/controller/src/calenmultipledbui.cpp
calendarui/controller/src/calentoolbarimpl.cpp
calendarui/controller/src/calenviewattachmentsdialog.cpp
calendarui/controller/src/calenviewpopulator.cpp
calendarui/editors/data/CalenDefaultEditorsData.rss
calendarui/editors/inc/CalenDescription.h
calendarui/editors/inc/CalenEditorDataHandler.h
calendarui/editors/inc/calendbfield.h
calendarui/editors/inc/calenreminderfield.h
calendarui/editors/inc/calenunifiededitor.h
calendarui/editors/inc/calenunifiededitorcontrol.h
calendarui/editors/src/CalenDescription.cpp
calendarui/editors/src/CalenEditorDataHandler.cpp
calendarui/editors/src/CalenEntryUpdater.cpp
calendarui/editors/src/calenalldayfield.cpp
calendarui/editors/src/calendbfield.cpp
calendarui/editors/src/calenreminderfield.cpp
calendarui/editors/src/calenrepeatfield.cpp
calendarui/editors/src/calenunifiededitor.cpp
calendarui/editors/src/calenunifiededitorcontrol.cpp
calendarui/globaldata/group/CalenGlobalData.mmp
calendarui/globaldata/group/bld.inf
calendarui/globaldata/inc/calendbchangenotifier.h
calendarui/globaldata/inc/calenfilemapping.h
calendarui/globaldata/inc/calensend.h
calendarui/globaldata/src/calendbchangenotifier.cpp
calendarui/globaldata/src/calenfilemapping.cpp
calendarui/globaldata/src/calensend.cpp
calendarui/group/bld.inf
calendarui/help/data/xhtml.zip
calendarui/help/inc/cale.hlp.hrh
calendarui/loc/calendar.loc
calendarui/multicaluidialog/group/multicaluidialog.mmp
calendarui/multicaluidialog/inc/caluidialogimpl.h
calendarui/multicaluidialog/inc/multicaluidialogimpl.h
calendarui/multicaluidialog/inc/multicaluidialogmodel.h
calendarui/multicaluidialog/src/caldblistboxitemdrawer.cpp
calendarui/multicaluidialog/src/caluidialogimpl.cpp
calendarui/multicaluidialog/src/multicaluidialogimpl.cpp
calendarui/multicaluidialog/src/multicaluidialogmodel.cpp
calendarui/organizerplugin/aiagendaplugin2/data/aicalendarplugin2.rss
calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2.h
calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2constantdata.h
calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2constants.hrh
calendarui/organizerplugin/aiagendaplugin2/inc/aicalendarplugin2data.h
calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2.cpp
calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2constantdata.cpp
calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2data.cpp
calendarui/organizerplugin/aiagendaplugin2/src/aicalendarplugin2focusdata.cpp
calendarui/organizerplugin/aiagendapluginengine/inc/AIAgendaPluginEngineImpl.h
calendarui/organizerplugin/aiagendapluginengine/src/AIAgendaPluginEngineImpl.cpp
calendarui/organizerplugin/aiagendapluginengine/src/CalenAsyncCommands.cpp
calendarui/organizerplugin/aiagendapluginengine/src/CalenEngine.cpp
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/loc/organizerconfiguration.loc
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/xuikon/00/organizer.css
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/xuikon/37/organizer.css
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/xuikon/50/organizer.css
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/xuikon/57/organizer.css
calendarui/organizerplugin/data/qhd_tch/organizer_2001f481/xuikon/94/organizer.css
calendarui/rom/CalenSvr.iby
calendarui/server/CalenSvr/data/calensvrmissedalarmmanagerresource.rss
calendarui/server/CalenSvr/group/CalenSvr.mmp
calendarui/server/CalenSvr/inc/CalSvrSession.h
calendarui/server/CalenSvr/inc/CalenServer.h
calendarui/server/CalenSvr/inc/CalenSvrBootManager.h
calendarui/server/CalenSvr/inc/CalenSvrDBManager.h
calendarui/server/CalenSvr/src/CalSvrSession.cpp
calendarui/server/CalenSvr/src/CalenServer.cpp
calendarui/server/CalenSvr/src/CalenSvrBootManager.cpp
calendarui/server/CalenSvr/src/CalenSvrDBManager.cpp
calendarui/server/CalenSvr/src/calensvrmissedalarmmanager.cpp
calendarui/server/CalenSvrClient/src/CalSvrClient.cpp
calendarui/settings/GsPlugin/inc/calendummyservices.h
calendarui/settings/GsPlugin/src/calendummyservices.cpp
calendarui/settings/settingsui/BWINS/calensettingsuiu.def
calendarui/settings/settingsui/eabi/calensettingsuiu.def
calendarui/settings/settingsui/group/calensettingsui.mmp
calendarui/settings/settingsui/inc/calensetting.h
calendarui/settings/settingsui/inc/calensettingsuicontainer.h
calendarui/settings/settingsui/src/CalenFileListSettingItem.cpp
calendarui/settings/settingsui/src/calensetting.cpp
calendarui/settings/settingsui/src/calensettingsuicontainer.cpp
calendarui/views/group/calenviews.mmp
calendarui/views/inc/calencontainer.h
calendarui/views/inc/calendaycontainer.h
calendarui/views/inc/calendaylistbox.h
calendarui/views/inc/calendaylistboxitemdrawer.h
calendarui/views/inc/calendayview.h
calendarui/views/inc/caleneventview.h
calendarui/views/inc/caleneventviewcontainer.h
calendarui/views/inc/calenicondrawer.h
calendarui/views/inc/calenmissedalarmscontainer.h
calendarui/views/inc/calenmissedalarmsview.h
calendarui/views/inc/calenmissedeventcontainer.h
calendarui/views/inc/calenmonthcontainer.h
calendarui/views/inc/calentodocontainer.h
calendarui/views/inc/calentodoview.h
calendarui/views/inc/calenweekcontainer.h
calendarui/views/inc/calenweeklistbox.h
calendarui/views/inc/calenweekview.h
calendarui/views/src/calencontainer.cpp
calendarui/views/src/calencontainerlayoutmanager.cpp
calendarui/views/src/calendaycontainer.cpp
calendarui/views/src/calendaylistbox.cpp
calendarui/views/src/calendaylistboxitemdrawer.cpp
calendarui/views/src/calendaylistboxmodel.cpp
calendarui/views/src/calendaylistboxview.cpp
calendarui/views/src/calendayview.cpp
calendarui/views/src/caleneventview.cpp
calendarui/views/src/caleneventviewcontainer.cpp
calendarui/views/src/calenicondrawer.cpp
calendarui/views/src/calenmissedalarmscontainer.cpp
calendarui/views/src/calenmissedalarmsview.cpp
calendarui/views/src/calenmissedeventcontainer.cpp
calendarui/views/src/calenmissedeventview.cpp
calendarui/views/src/calenmonthcelllistboxitemdrawer.cpp
calendarui/views/src/calenmonthcontainer.cpp
calendarui/views/src/calentodocontainer.cpp
calendarui/views/src/calentodoview.cpp
calendarui/views/src/calenweekcontainer.cpp
calendarui/views/src/calenweeklistboxdata.cpp
calendarui/views/src/calenweekview.cpp
clock2/clockengines/clockserver/server/src/clockserverimpl.cpp
clock2/clockengines/clocktimezoneresolver/src/clockmcctzmapper.cpp
clock2/clockengines/utilities/clockecomlistener/group/clockecomlistener.mmp
clock2/clockengines/utilities/clockecomlistener/src/clockecomlistener.cpp
clock2/clockui/adtupdater/inc/adtupdatercontainer.h
clock2/clockui/adtupdater/src/adtupdaterappui.cpp
clock2/clockui/adtupdater/src/adtupdatercontainer.cpp
clock2/clockui/alarmeditorapp/group/alarmeditorapp.mmp
clock2/clockui/plugins/clockindicatorpaneplugin/data/clockindicatorpaneplugin.rss
clock2/clockui/plugins/clockindicatorpaneplugin/src/clockindicatorpluginlistener.cpp
clock2/clockui/uilayer/clkdatetimeview/group/clkdatetimeview.mmp
clock2/clockui/uilayer/clkdatetimeview/src/clkdatetimeview.cpp
clock2/clockui/uilayer/clockalarmeditor/data/clockalarmeditor.ra
clock2/clockui/uilayer/clockalarmeditor/group/clockalarmeditor.mmp
clock2/clockui/uilayer/clockalarmeditor/inc/clockalarmeditorimpl.h
clock2/clockui/uilayer/clockalarmeditor/src/clockalarmeditorimpl.cpp
clock2/clockui/uilayer/clockmainview/inc/clockalarmarray.h
clock2/clockui/uilayer/clockmainview/inc/clockmaincontainer.h
clock2/clockui/uilayer/clockmainview/inc/clockmainview.h
clock2/clockui/uilayer/clockmainview/src/clockalarmarray.cpp
clock2/clockui/uilayer/clockmainview/src/clockmaincontainer.cpp
clock2/clockui/uilayer/clockmainview/src/clockmainview.cpp
clock2/clockui/uilayer/clockworldview/src/clockworldcontainer.cpp
clock2/clockui/uilayer/clockworldview/src/clockworlditemprocessor.cpp
clock2/clockui/uilayer/clockworldview/src/clockworldview.cpp
clock2/clockui/uilayer/data/clock.rss
clock2/clockui/uilayer/group/clock.mmp
clock2/clockui/uilayer/inc/clock.hrh
clock2/clockui/uilayer/inc/clockappui.h
clock2/clockui/uilayer/inc/clockdocument.h
clock2/clockui/uilayer/loc/clockapp.loc
clock2/clockui/uilayer/rom/clockresources.iby
clock2/clockui/uilayer/src/clockappui.cpp
clock2/clockui/uilayer/src/clockdocument.cpp
clock2/clockui/uimodel/bwins/clkuimodelu.def
clock2/clockui/uimodel/eabi/clkuimodelu.def
clock2/clockui/uimodel/group/clkuimodel.mmp
clock2/clockui/uimodel/inc/clkuialarmmodel.h
clock2/clockui/uimodel/inc/clkuiclksrvlistener.h
clock2/clockui/uimodel/src/clkuialarmlistener.cpp
clock2/clockui/uimodel/src/clkuialarmmodel.cpp
clock2/clockui/uimodel/src/clkuiclksrvlistener.cpp
clock2/clockui/utilities/clockmarqueelabel/src/clockmarqueelabel.cpp
clock2/clockui/utilities/data/timezonegroups.rss
clock2/clockui/utilities/data/timezonegroups_jerusalem.rss
clock2/clockui/utilities/data/timezones.rss
clock2/clockui/utilities/data/timezones_tel_aviv.rss
clock2/clockui/utilities/data/tzdb.dbz
clock2/clockui/utilities/loc/timezonelocalization.loc
clock2/conf/clockapp.confml
clock2/help/data/xhtml.zip
clock2/help/inc/clk.hlp.hrh
notepad/notepad1/LibData/NpdLib.rss
notepad/notepad1/LibSrc/NpdCoreModel.cpp
notepad/notepad1/LibSrc/NpdDialogBase.cpp
notepad/notepad1/LibSrc/NpdEditorDialog.cpp
notepad/notepad1/LibSrc/NpdEdwinBase.cpp
notepad/notepad1/LibSrc/NpdExternalTextEditorDialog.cpp
notepad/notepad1/LibSrc/NpdListDialog.cpp
notepad/notepad1/LibSrc/NpdModel.cpp
notepad/notepad1/LibSrc/NpdPopupList.cpp
notepad/notepad1/LibSrc/NpdViewerDialog.cpp
notepad/notepad1/group/NpdLib.mmp
notepad/notepad1/group/NpdViewer.mmp
notepad/notepad1/inc/NpdDialogBase.h
notepad/notepad1/inc/NpdDialogBase.inl
notepad/notepad1/inc/NpdLib.rh
notepad/notepad1/inc/NpdListDialog.h
notepad/notepad1/inc/NpdModel_platsec.h
notepad/notepad1/inc/NpdViewerDialog.h
organizer_plat/calendar_common_utils_api/inc/CalenStatusPaneUtils.h
organizer_plat/calendar_common_utils_api/inc/calenconstants.h
organizer_plat/calendar_common_utils_api/inc/calenmulticaluids.hrh
organizer_plat/calendar_common_utils_api/tsrc/group/CalendarCommonUtilsTest_DoxyFile.txt
organizer_plat/calendar_custamization_api/inc/calencommands.hrh
organizer_plat/calendar_custamization_api/inc/calencontext.h
organizer_plat/calendar_custamization_api/inc/calennotificationhandler.h
organizer_plat/calendar_custamization_api/inc/calenservices.h
organizer_plat/calendar_settings_keys_api/inc/CalendarInternalCRKeys.h
organizer_pub/notepad_library_api/tsrc/.cproject
organizer_pub/notepad_library_api/tsrc/.project
searchfw/coresearchfw/server/src/searchserversession.cpp
searchfw/plugins/contactsplugin/group/contactsplugin.mmp
searchfw/plugins/contactsplugin/src/contactssearcher.cpp
searchfw/plugins/filesplugin/src/filessearcher.cpp
searchui/searchapp/plugins/resultviewerplugin/src/srchuiresultview.cpp