Merge RCL_3 fixes with reverted delivery RCL_3 PDK_3.0.2
authorShabe Razvi <shaber@symbian.org>
Thu, 02 Sep 2010 16:01:42 +0100
branchRCL_3
changeset 62 c50786bbedec
parent 61 8cb079868133 (current diff)
parent 58 8e551af32cc5 (diff)
child 67 6ff7ee498df1
Merge RCL_3 fixes with reverted delivery
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Wed Sep 01 12:34:26 2010 +0100
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Thu Sep 02 16:01:42 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