# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269890986 -3600
# Node ID 1ac0a0999e8138a2744ca202a9c313866e7c573d
# Parent  7acb7382c3b381beeb671f0a021dc3552e15357a# Parent  148e88b84d9a827c1ad90668deefdbba13fc35eb
Merge.

diff -r 7acb7382c3b3 -r 1ac0a0999e81 sipvoipprovider/inc/svpconsts.h
--- a/sipvoipprovider/inc/svpconsts.h	Sun Mar 28 16:35:57 2010 +0100
+++ b/sipvoipprovider/inc/svpconsts.h	Mon Mar 29 20:29:46 2010 +0100
@@ -218,7 +218,7 @@
 _LIT8( KSVPSubsStateTerminated,   "Subscription-State: terminated;reason=noresource");
 
 _LIT( KSVPS60,"S60" );
-_LIT( KSVPCopyright, "©" );
+_LIT( KSVPCopyright, "\xa9" );
 _LIT(KSVPSalesModelFileName, "\\resource\\versions\\model.txt");
 
 // Emergency constants
diff -r 7acb7382c3b3 -r 1ac0a0999e81 voipplugins/ipapputils/src/cipappphoneutils.cpp
--- a/voipplugins/ipapputils/src/cipappphoneutils.cpp	Sun Mar 28 16:35:57 2010 +0100
+++ b/voipplugins/ipapputils/src/cipappphoneutils.cpp	Mon Mar 29 20:29:46 2010 +0100
@@ -27,7 +27,7 @@
 _LIT8( KSVPSpaceMark, " " );
 _LIT8( KSVPLineFeed, "\n" );
 _LIT( KSVPSalesModelFileName, "\\resource\\versions\\model.txt" );
-_LIT( KSVPCopyright, "©" );
+_LIT( KSVPCopyright, "\xa9" );
 _LIT( KSVPCopyright2, "(C)" );
 _LIT( KSVPCopyright3, "(c)" );
 _LIT( KSVPSpace2, " " );