# HG changeset patch # User William Roberts # Date 1282566804 -3600 # Node ID dd2df52277006991ed6556f29a672275d2038b4b # Parent 072a9626b290abd29d592d71dd04785a1c419b95# Parent 22666f07682bfffa4171b9966aae3957543aaaf8 Remerge workaround for Bug 2620 in S^4 diff -r 072a9626b290 -r dd2df5227700 sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf --- a/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf Wed Aug 18 11:03:14 2010 +0300 +++ b/sysstatemgmt/systemstateplugins/gsapolicy/group/bld.inf Mon Aug 23 13:33:24 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