# HG changeset patch # User William Roberts # Date 1275052708 -3600 # Node ID 5ced40f3c181862f046f038fff3da4fd93841a78 # Parent 4a5c47a50617d9bf9b0b44062e9aa8614961ec49 Re-merge workaround for bug 2620 diff -r 4a5c47a50617 -r 5ced40f3c181 sysstatemgmt/systemstateplugins/gsapolicy/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