Merging branches/v0.6-initdev into trunk.

Browse source

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

...

This commit is contained in:

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

parent 8bb90bb9f8 7ca3ed78ae

commit c0738eec7f

407 changed files with 23716 additions and 50779 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1361

libretroshare/src/rsserver/rsinit.cc

View file

File diff suppressed because it is too large Load diff