Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-16 04:52:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit c0738eec7f
407 changed files with 23716 additions and 50779 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libretroshare/src/retroshare/rsplugin.h
View file

@ -42,7 +42,7 @@ class RsTurtle ;
class RsDht ;
class RsDisc ;
class RsMsgs ;
class RsForums;
//class RsForums;
class RsNotify;
class p3LinkMgr ;
class MainPage ;
@ -100,7 +100,7 @@ public:
RsTurtle *mTurtle;
RsDisc *mDisc;
RsDht *mDht;
RsForums *mForums;
//RsForums *mForums;
RsNotify *mNotify;
};