Re-merge workaround for bug 2620 RCL_3
authorWilliam Roberts <williamr@symbian.org>
Fri, 28 May 2010 14:18:28 +0100
branchRCL_3
changeset 28 fd2cca8d453c
parent 27 4a5c47a50617 (current diff)
parent 25 8b6c1c3d207b (diff)
child 46 c903c54160b5
Re-merge workaround for bug 2620
hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf
hwrmhaptics/hapticspacketizer/group/bld.inf
--- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Tue May 25 14:04:18 2010 +0300
+++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf	Fri May 28 14:18:28 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