drbob c0738eec7f Merging branches/v0.6-initdev into trunk. ... These split at 6672 -> 7075, so quite a bit merge. libretroshare compiles - but untested. retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors). some plugins will be broken. retroshare-nogui is untested. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc		2014-02-01 14:16:15 +00:00
..
pgphandler.cc	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00
pgphandler.h	moved PGP id types into rsid.h, and renamed them with a more appropriate name	2014-01-03 22:42:17 +00:00
pgpkeyutil.cc	- added new certificate format in ConfCertDialog and ConnectFriendWizard, with a button to switch to old format if necessary	2012-08-13 19:37:50 +00:00
pgpkeyutil.h	fixed code for certificate link generation.	2012-08-14 19:31:47 +00:00
rscertificate.cc	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00
rscertificate.h	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00