Merge re-apply fix for Bug 2620 RCL_3
authorandy simpson <andrews@symbian.org>
Fri, 17 Sep 2010 17:21:53 +0100
branchRCL_3
changeset 67 6ff7ee498df1
parent 66 c26be94c8889 (current diff)
parent 62 c50786bbedec (diff)
child 75 cce17d67ea66
Merge re-apply fix for Bug 2620
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue Sep 14 23:45:36 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri Sep 17 17:21:53 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