# HG changeset patch # User andy simpson # Date 1283517239 -3600 # Node ID 8765b1ff83326bec2ee2e3eb923a87ab86b7c001 # Parent 419d6cfdb7155bb503039e972388b7eaf2042eba# Parent c92d4f3c47c58246175d44efa5c57376f15102f5 Merge after removal of incorrect RCL_3 drop diff -r 419d6cfdb715 -r 8765b1ff8332 datasourceadaptation/gpsdatasourceadaptation/common/test/lbsgenericpsytest/group/te_lbsgenericpsytest.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpsconfig/src/lbsbtgpsconfigimpl.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/101FE99A.rss diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsyconstants.rss diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/bluetoothgpspositioningmodule/group/lbsbtgpspsy.iby diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/src/epos_cposexternalgpsmonitor.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/src/epos_cpospsyfixstatemanager.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/src/epos_cpospsylisthandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/test/te_defproxy/scripts/te_defproxysuite.script diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/test/te_defproxy/src/hgenericinfostep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/test/te_defproxy/src/partialupdatestep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/test/te_defproxy/src/trackingsessionstep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/defaultpositioningmodule/test/te_defproxy/src/twopsysactivestep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/gpspositioningmodule/lbsagpspsy/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/gpspositioningmodule/lbsgpspsy/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/locationapesuplpsy/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/locationapesuplpsy/group/nla_ape_suplpsy.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/locationapesuplpsy/inc/suplpsyrequestor.h diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/locationapesuplpsy/src/suplpsyrequestor.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 datasourcemodules/networkpositioningmodule/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 lbsapitest/lbshaitest/lbsclient/group/t_lbsclient.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/group/ctlbsromsuitetestserver.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/group/lbsromspecificsuite.iby diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/scripts/lbsfullromsuite.script diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/scripts/lbsstandaloneprivacysuite.script diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/LbsROMspecificSuites/src/ctpositionerteststep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/agpsmodule/src/ctagpsmodule.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/group/lbs_testproduct.mrp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/hybridprotocolmodule/eabi/GetafixUtilsu.def diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/hybridprotocolmodule/getafixutils/src/PropPipe.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsbackuprestore/inc/te_lbsbackuprestoresuitedefs.h diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsbackuprestore/src/checkpsyexiststep.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/group/ctlbsclientportedsuite.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/group/ctlbsclientserver.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/inc/ctlbsclientserver.h diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/inc/ctlbsclientsteplastknownpos.h diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/scripts/lbsclientlastknownpos.script diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/src/ctlbsclientsteplastknownpos.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/src/ctlbsclientsteplastknownposarea.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/src/ctlbsclientstepmodstatus.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/src/ctlbsclientstepsrvconnectclose.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbsclient/testdata/lbsclientlastknownpos.ini diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/group/ctlbshybridmolrserver.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/inc/ctlbsmolrtracking.h diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/src/ctlbshybridmolrserver.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/src/ctlbsmolrtracking.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmolr/testdata/lbs_molr_tracking.ini diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmtlr/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmtlr/group/ctlbshybridmtlrserver.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbshybridmtlr/src/ctlbshybridmtlrserver.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbstestutils/EABI/LbsTestUtilsU.DEF diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/lbstestutils/src/tlbsutils.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsHybridMolrSuite.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsHybridMtlrSuite.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_lbsnetworkprivacySuite/testexecuteservers/te_networkprivacySuite.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsUnitSuite.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsUnitSuite/te_lbsagpspsysuite/te_lbsagpspsytest.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsUnitSuite/te_lbsgpspsysuite/te_lbsgpspsytest.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsUnitSuite/te_lbslocationinfoconvertersuite/te_lbslocationinfoconvertertest.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/tdxml/LbsSuite/LbsUnitSuite/te_lbsnetpsysuite/te_lbsnetpsytest.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/group/te_lbsbtgpspsy.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml diff -r 419d6cfdb715 -r 8765b1ff8332 lbstest/locationprotocoltest/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/GPSClock/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsADataCache/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/inc/LbsCommon.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/inc/LbsErrors.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/inc/LbsPosition.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/src/LbsAreaInfo.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositionInfo.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/src/lbsfields.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsClient/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsInternalApi/BWINS/LbsInternalApiU.DEF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsInternalApi/EABI/LbsInternalApiU.DEF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsInternalApi/group/LbsInternalApi.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsNetInternalApi/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsNetProtocol/inc/lbsnetprotocolbase.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsNetRegStatusInt/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsPartnerCommon/src/lbsdevlogger.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/LbsRefFnpInt/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/conf/locationsettings.confml diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/conf/locationsettings_10282266.crml diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/group/lbs_admin.mrp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/group/lbsadmin.iby diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/inc/lbsmessageenums.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbslocsettings/data/101f500c.txt diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbslocsettings/inc/epos_cpospluginslist.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbslocsettings/src/epos_cpospluginslist.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/group/10282266.cre diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/group/10282266.txt diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/inc/lbsrootcenrepdefs.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/inc/lbssystemstatelistener.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/src/lbsroot.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsroot/src/lbssystemstatelistener.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locationcore/lbsrootapi/inc/lbspropertykeydefs.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorapis/conf/locationinfoconverter.confml diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorapis/conf/locationinfoconverter_20026814.crml diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/group/lbslocationmonitor.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitorgpsbus.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/src/clbsconversionpositionersubsession.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorconversionhandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorrequesthandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitorserver.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/test/testlocationmonitor/group/testlocationmonitor.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitorgpsbus.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitorposlistener.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationmgmt/networkgateway/src/netrequestchannel.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/inc/EPos_CPosLocMonitorReqHandlerHub.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/inc/EPos_CPosModulesStatus.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/inc/EPos_ServerPanic.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/lbstestpsys/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/src/EPos_CPosLocMonitorReqHandlerHub.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/src/EPos_CPosModulesStatus.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/src/EPos_CPosServer.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/src/EPos_CPosSubSession.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/test/te_locsrv/scripts/te_locsrvsuite.script diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/test/te_locsrvtestlocmonsuite/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/test/testLocServer/group/testlocserver.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/locationserver/traces/osttracedefinitions.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/LbsX3P/group/BLD.INF diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/inc/privacyandlocationrequesthandler.h diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/src/lbsnetworkrequesthandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/src/lbsnrhx3pserver.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/src/ngmessageswitch.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/src/privacyandlocationrequesthandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/src/privacyhandler.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/networkpmasn1_pub/group/lbs_networkpmasn1_pub.mrp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/networkprotocolmodule/LbsProtocolModule/src/cconfigmanager.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/privacyprotocolmodule/ClientAPI/NetworkPrivacyAPI/inc/EPos_NetworkPrivacyPanicDeclaration.h diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/src/privacyshutdown.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/privacyprotocolmodule/test/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/suplproxyprotocolmodule/clientapi/suplposmsgpluginapi/src/epos_comasuplreqasstdata.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/suplproxyprotocolmodule/suplproxyprotocolmodule/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/suplproxyprotocolmodule/suplproxyprotocolmodule/src/suplproxymodule.cpp diff -r 419d6cfdb715 -r 8765b1ff8332 networkprotocolmodules/suplproxyprotocolmodule/test/group/bld.inf diff -r 419d6cfdb715 -r 8765b1ff8332 package_definition.xml