Re-merge workaround for bug 2620. RCL_3 PDK_3.0.1
authorPat Downey <patd@symbian.org>
Tue, 13 Jul 2010 15:17:31 +0100
branchRCL_3
changeset 47 a616a19c9ce0
parent 43 0b0048910c20 (current diff)
parent 32 5ced40f3c181 (diff)
child 58 8e551af32cc5
Re-merge workaround for bug 2620.
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Mon Jun 21 17:06:14 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue Jul 13 15:17:31 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