# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1282575650 -3600
# Node ID 3e8fd025b75be79c2b8b302e1ab1f0a1c9906e79
# Parent  ef813d54df514af1801edd259ac5b93d6c48cecd# Parent  e08ac1a3ba2bd74f7061bed8c6cd3b6b58c692dd
Remerge fix for Bug 3323

diff -r ef813d54df51 -r 3e8fd025b75b organizer_plat/calendar_settings_keys_api/inc/calendardomaincrkeys.h
--- a/organizer_plat/calendar_settings_keys_api/inc/calendardomaincrkeys.h	Wed Aug 18 09:47:38 2010 +0300
+++ b/organizer_plat/calendar_settings_keys_api/inc/calendardomaincrkeys.h	Mon Aug 23 16:00:50 2010 +0100
@@ -1,1 +1,39 @@
-/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved.* This component and the accompanying materials are made available* under the terms of "Eclipse Public License v1.0"* which accompanies this distribution, and is available* at the URL "http://www.eclipse.org/legal/epl-v10.html".** Initial Contributors:* Nokia Corporation - initial contribution.** Contributors:** Description:   The file contains the uid of domain keys.**/#ifndef CALENDARDOMAINCRKEYS_H#define CALENDARDOMAINCRKEYS_H/** Calendar UI Settings keys*//** Provides access to the Calendar application's settings keys */const long int KCRUidCalendar =  { 0x101F874B };/*** Defines the time between alarm snoozes, in minutes.* Default value: 5**/const long int KCalendarSnoozeTime = 0x00000001;/*** Default Calendar alarm sound file.* Default value : "z:\data\sounds\digital\alarm.aac"**/const long int KCalendarDefaultSoundFile = 0x00000003;#endif  	// CALENDARDOMAINCRKEYS_H// End of file	--Don't remove this.
\ No newline at end of file
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   The file contains the uid of domain keys.
+*
+*/
+
+#ifndef CALENDARDOMAINCRKEYS_H
+#define CALENDARDOMAINCRKEYS_H
+
+/** Calendar UI Settings keys*/
+/** Provides access to the Calendar application's settings keys */
+const long int KCRUidCalendar =  { 0x101F874B };
+
+/**
+* Defines the time between alarm snoozes, in minutes.
+* Default value: 5
+**/
+const long int KCalendarSnoozeTime = 0x00000001;
+
+/**
+* Default Calendar alarm sound file.
+* Default value : "z:\data\sounds\digital\alarm.aac"
+**/
+const long int KCalendarDefaultSoundFile = 0x00000003;
+
+#endif  	// CALENDARDOMAINCRKEYS_H
+
+// End of file	--Don't remove this.
\ No newline at end of file
diff -r ef813d54df51 -r 3e8fd025b75b organizer_plat/clock_settings_keys_api/inc/clockdomaincrkeys.h
--- a/organizer_plat/clock_settings_keys_api/inc/clockdomaincrkeys.h	Wed Aug 18 09:47:38 2010 +0300
+++ b/organizer_plat/clock_settings_keys_api/inc/clockdomaincrkeys.h	Mon Aug 23 16:00:50 2010 +0100
@@ -1,1 +1,31 @@
-/** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved.* This component and the accompanying materials are made available* under the terms of "Eclipse Public License v1.0"* which accompanies this distribution, and is available* at the URL "http://www.eclipse.org/legal/epl-v10.html".** Initial Contributors:* Nokia Corporation - initial contribution.** Contributors:** Description:   The file contains the uid of domain keys.**/#ifndef CLOCKDOMAINCRKEYS_H#define CLOCKDOMAINCRKEYS_H/**Clock Settings keys*//**Provides access to the ClockSettings keys*/const long int KCRUidClockApp =  { 0x101F874D };/**Default clock alarm sound file*/const long int KClockAppDefaultSoundFile = 0x00000000;/** Alarm snooze time key */const long int KClockAppSnoozeTime = 0x00000001;#endif  	// CLOCKDOMAINCRKEYS_H// End of file	--Don't remove this.
\ No newline at end of file
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   The file contains the uid of domain keys.
+*
+*/
+
+#ifndef CLOCKDOMAINCRKEYS_H
+#define CLOCKDOMAINCRKEYS_H
+
+/**Clock Settings keys*/
+/**Provides access to the ClockSettings keys*/
+const long int KCRUidClockApp =  { 0x101F874D };
+/**Default clock alarm sound file*/
+const long int KClockAppDefaultSoundFile = 0x00000000;
+/** Alarm snooze time key */
+const long int KClockAppSnoozeTime = 0x00000001;
+
+#endif  	// CLOCKDOMAINCRKEYS_H
+
+// End of file	--Don't remove this.
\ No newline at end of file