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
..
src	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00