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

..

ConfCertDialog.cpp

Merging branches/v0.6-initdev into trunk.

2014-02-01 14:16:15 +00:00

ConfCertDialog.h

Code maintenance for Qt 5:

2013-10-18 21:10:33 +00:00

ConfCertDialog.ui

show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed the use of the ambiguous peer id for both pgp and locations ids

2013-11-09 22:52:26 +00:00

ConnectFriendWizard.cpp

Merging branches/v0.6-initdev into trunk.

2014-02-01 14:16:15 +00:00

ConnectFriendWizard.h

Moved friend recommendations into the ConnectFriendWizard

2013-09-02 22:51:26 +00:00

ConnectFriendWizard.ui

Added a warning info label for the make friend Wizard

2013-10-08 16:45:14 +00:00

ConnectProgressDialog.cpp

Code maintenance for Qt 5:

2013-10-18 21:10:33 +00:00

ConnectProgressDialog.h

Code maintenance for Qt 5:

2013-10-18 21:10:33 +00:00

ConnectProgressDialog.ui

* Corrected the layout of the Connect Progress Dialog

2014-01-04 19:54:07 +00:00