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
..
2013-10-17 14:56:53 +00:00
2013-10-03 22:50:36 +00:00
2013-10-18 21:10:33 +00:00
2012-12-03 14:21:22 +00:00
2013-10-20 00:56:34 +00:00
2013-10-20 00:56:34 +00:00
2012-12-03 15:55:01 +00:00
2013-10-20 00:56:34 +00:00
2013-10-20 00:56:34 +00:00
2013-10-22 12:04:11 +00:00
2013-10-22 12:04:11 +00:00
2013-10-22 12:04:11 +00:00