Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:51 +0000
branchCompilerCompatibility
changeset 6 d3f4aa43df41
parent 4 a5b0096567da (diff)
parent 3 4f62049db6ac (current diff)
child 9 c2cb2ecb7d09
Automatic merge from PDK_3.0.h
mmmw_plat/mtp_keys_api/group/bld.inf
mmmw_plat/mtp_keys_api/inc/MtpPrivateCRKeys.h
mmmw_plat/mtp_keys_api/inc/MtpPrivatePSKeys.h
mmmw_plat/mtp_keys_api/mtp_keys_api.metaxml
mmmw_plat/mtp_wmdrm_api/group/bld.inf
mmmw_plat/mtp_wmdrm_api/inc/MMtpJanusDrmIf.h
mmmw_plat/mtp_wmdrm_api/mtp_wmdrm_api.metaxml
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_wClose.SIS
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/SignedVoIPTestClass_woClose.SIS
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.pkg
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sis
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/VoIPAudioServicesTestClass.sisx
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd-key.pem
mmmw_plat/voip_audio_services_api/tsrc/VoIPAudioServicesTestClass/group/rd.cer