Merge workaround for bug 2630.
authorPat Downey <patd@symbian.org>
Thu, 24 Jun 2010 11:22:10 +0100
changeset 39 a003130def4e
parent 30 d11478a8d5cf (current diff)
parent 31 51d936fe0d0c (diff)
child 40 65b8e37066ef
Merge workaround for bug 2630.
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Jun 02 13:09:11 2010 +0100
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Jun 24 11:22:10 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