Merge heads on RCL_1 RCL_1 PDK_2.0.2
authorShabe Razvi <shaber@symbian.org>
Mon, 16 Nov 2009 14:42:37 +0000
branchRCL_1
changeset 24 c09e56b72f1c
parent 23 29f45646a5e3 (diff)
parent 22 1440dc310db1 (current diff)
child 27 2d7679d6a290
Merge heads on RCL_1
cryptoservices/browserootcertificates/certconvert.py
cryptoservices/browserootcertificates/certdata.txt
cryptoservices/browserootcertificates/trustmapping.txt
cryptoservices/rootcertificates/SymbianA.der
cryptoservices/rootcertificates/SymbianB.der
cryptoservices/rootcertificates/SymbianSignedCerts.txt
cryptoservices/rootcertificates/rootcerts.history.xml
cryptoservices/rootcertificates/rootcerts.mrp
cryptoservices/rootcertificates/swicertstore.dat
cryptoservices/rootcertificates/symbianc.der
cryptoservices/rootcertificates/symbiand.der
--- a/.hgtags	Fri Nov 13 15:59:20 2009 +0530
+++ b/.hgtags	Mon Nov 16 14:42:37 2009 +0000
@@ -1,3 +1,4 @@
 1c92dfe68cf295005ae0d14f84b564266c71cf6d PDK_2.0.d
 8e4b1aa36db9a551f334ad5e01f90f1f4adcaa70 PDK_2.0.e
 1d329321bec736d2b635c91c7deccf9cb27330ac PDK_2.0.0
+e60b2dbc57a065267318f5d93fc155c7096d66f4 PDK_2.0.1