# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813101 -3600
# Node ID f3d2589f22d6bcc20b5afb785f9fe8e68c32dc38
# Parent  3b7506f6333531d7fc9839213a2f97cdfa1e597a# Parent  d141fc1ad77bdf7158e676a516b55e044c191909
Catchup to latest Symbian^4

diff -r d141fc1ad77b -r f3d2589f22d6 mmappcomponents/mediaplayersettingsengine/group/MPSettEng.mmp
--- a/mmappcomponents/mediaplayersettingsengine/group/MPSettEng.mmp	Tue Jul 06 14:48:59 2010 +0300
+++ b/mmappcomponents/mediaplayersettingsengine/group/MPSettEng.mmp	Thu Jul 22 16:38:21 2010 +0100
@@ -35,7 +35,7 @@
 LIBRARY         euser.lib
 LIBRARY         ecom.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../eabi/
 #elif defined(WINSCW)
 deffile ../bwinscw/
diff -r d141fc1ad77b -r f3d2589f22d6 qtms/src/qtmsbufferimpl.cpp