diff -r a3a1ae9acec6 -r da5135c61bad meetingrequest/mrservices/group/esmrservices.mmp
--- a/meetingrequest/mrservices/group/esmrservices.mmp	Mon Mar 15 12:39:10 2010 +0200
+++ b/meetingrequest/mrservices/group/esmrservices.mmp	Wed Mar 31 21:08:33 2010 +0300
@@ -16,9 +16,8 @@
 */
 
 
-#include "../../../inc/emailversionnumbers.hrh" // KEmailBinaryVersionNumber
+#include "../../inc/esmrinternaluid.h"
 #include "../../../inc/emailtraceconfig.hrh"
-#include "../../inc/esmrinternaluid.h"
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 
@@ -30,16 +29,12 @@
 VENDORID                VID_DEFAULT
 DEFFILE                 ESMRServices.def
 
-VERSION                 KEmailBinaryVersionNumber
-KEmailBinaryDemandPaging
-
 SOURCEPATH              ../src
 SOURCE                  cesmrrecurrenceinfohandler.cpp
 SOURCE                  cesmrcalimportexporter.cpp
 SOURCE                  cesmralarminfohandler.cpp
 SOURCE                  cesmrcaluserutil.cpp
-SOURCE                  cesmrattachment.cpp
-SOURCE                  cesmrattachmentinfo.cpp
+SOURCE                  cesmrconflictchecker.cpp
 
 USERINCLUDE             .
 USERINCLUDE             ../inc
@@ -48,7 +43,11 @@
 
 APP_LAYER_SYSTEMINCLUDE
 
+//<cmail>
+//<cmail>
 USERINCLUDE ../../../inc
+//</cmail>
+//</cmail>
 
 START RESOURCE          ../data/alarminfo/esmralarminfo.rss
 HEADER
@@ -71,10 +70,9 @@
 LIBRARY                 calinterimapi.lib
 LIBRARY                 caleninterimutils2.lib
 LIBRARY                 charconv.lib
-LIBRARY                 cmaillogger.lib
 
-#ifdef TRACE_INTO_FILE
-LIBRARY                 flogger.lib
-#endif // TRACE_INTO_FILE
+#if defined( ENABLE_TRACES ) && defined( TRACE_INTO_FILE )
+LIBRARY flogger.lib
+#endif // ENABLE_TRACES && TRACE_INTO_FILE
 
 // EOF