# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275052708 -3600
# Node ID fd2cca8d453c78d1c967f0c5e719bb68d0e0a0d7
# Parent  4a5c47a50617d9bf9b0b44062e9aa8614961ec49# Parent  8b6c1c3d207b33f342a16021278e00fc712d9ac1
Re-merge workaround for bug 2620

diff -r 4a5c47a50617 -r fd2cca8d453c hwrmhaptics/hapticseffectdatagetterfw/group/bld.inf
diff -r 4a5c47a50617 -r fd2cca8d453c hwrmhaptics/hapticspacketizer/group/bld.inf
diff -r 4a5c47a50617 -r fd2cca8d453c 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