Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-11 07:40:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merged Code from: /branches/v0.5-new_cache_system/ into main trunk.

Browse source 
- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-07-27 15:03:16 +00:00
commit bec1407648
170 changed files with 44564 additions and 11756 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/common/FriendList.h
View file

@ -114,7 +114,7 @@ private slots:
void msgfriend();
void recommendfriend();
void removefriend();
#ifdef UNFINISHED
#ifdef UNFINISHED_FD
void viewprofile();
#endif