Merge fix for bug 2620.
authorPat Downey <patd@symbian.org>
Thu, 24 Jun 2010 11:22:45 +0100
changeset 40 65b8e37066ef
parent 35 f7565e9c9ce8 (current diff)
parent 39 a003130def4e (diff)
Merge fix for bug 2620.
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri Jun 11 14:56:08 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Jun 24 11:22:45 2010 +0100
@@ -24,8 +24,9 @@
 ./sspluginsgsa.iby			/epoc32/rom/include/sspluginsgsa.iby
 
 PRJ_MMPFILES
-./gsastatepolicystartup.mmp
-./gsastatepolicyshutdown.mmp
+// darios: ssm.state.policy.000n.dll conflicting with s60 version (see bug 2620) (n=0,2,3)
+//./gsastatepolicystartup.mmp
+//./gsastatepolicyshutdown.mmp
 ./gsastatepolicynormal.mmp
-./gsastatepolicyfail.mmp
+//./gsastatepolicyfail.mmp