# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1282567825 -3600
# Node ID 6cd1edf5a70ddb46f95aa1a0bcee7538a6e944aa
# Parent  d4f567ce2e7cc01807eb3c8586e8abede9f6114a# Parent  22a79a0cd291703171b8d18c848f62dcaf2826ce
Merge RCL_3 fixes with latest delivery.

diff -r d4f567ce2e7c -r 6cd1edf5a70d phonebookengines/contactsmodel/inc/cntdef_internal.hrh
--- a/phonebookengines/contactsmodel/inc/cntdef_internal.hrh	Thu Aug 19 09:41:07 2010 +0300
+++ b/phonebookengines/contactsmodel/inc/cntdef_internal.hrh	Mon Aug 23 13:50:25 2010 +0100
@@ -47,4 +47,4 @@
 /** @internalComponent */
 #define KIntFieldFlagFilterable4	0x100
 
-#endif //__CNTDEF_INTERNAL_HRH__
\ No newline at end of file
+#endif //__CNTDEF_INTERNAL_HRH__
diff -r d4f567ce2e7c -r 6cd1edf5a70d phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp
--- a/phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp	Thu Aug 19 09:41:07 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp	Mon Aug 23 13:50:25 2010 +0100
@@ -13,18 +13,19 @@
 // Description:
 //
 
-target		t_cnt_backup.exe
-targettype	EXE
+TARGET		t_cnt_backup.exe
+TARGETTYPE	EXE
 UID		0x10281846
 CAPABILITY	ReadUserData WriteUserData ReadDeviceData WriteDeviceData AllFiles
 VENDORID	0x70000001
 
 SOURCEPATH	../tsrc
 
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN 
-userinclude ../inc 
+APP_LAYER_SYSTEMINCLUDE_SYMBIAN
+SYSTEMINCLUDE /epoc32/include/app-services/private
+USERINCLUDE ../inc 
 
-source		t_cnt_backup.cpp
+SOURCE		t_cnt_backup.cpp
 
 LIBRARY		cntmodel.lib euser.lib edbms.lib efsrv.lib bafl.lib sbeclient.lib
 LIBRARY     pimtestclient.lib
diff -r d4f567ce2e7c -r 6cd1edf5a70d phonebookengines/contactsmodel/tsrc/t_contenttype.mmp
--- a/phonebookengines/contactsmodel/tsrc/t_contenttype.mmp	Thu Aug 19 09:41:07 2010 +0300
+++ b/phonebookengines/contactsmodel/tsrc/t_contenttype.mmp	Mon Aug 23 13:50:25 2010 +0100
@@ -13,19 +13,20 @@
 // Description:
 //
 
-target          t_contenttype.exe
-targettype      EXE
+TARGET          t_contenttype.exe
+TARGETTYPE      EXE
 CAPABILITY   ReadUserData WriteUserData
 UID		0x1000007a
 VENDORID 0x70000001
 
 SOURCEPATH	../tsrc
 
-systeminclude /epoc32/include 
-userinclude ../inc . 
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/platform
+USERINCLUDE ../inc . 
 
-source          t_contenttype.cpp
+SOURCE          t_contenttype.cpp
 
-library         euser.lib efsrv.lib cntmodel.lib estor.lib
+LIBRARY         euser.lib efsrv.lib cntmodel.lib estor.lib
 
 SMPSAFE