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

fixed comflicts with upstream

Browse source
This commit is contained in:
csoler 2020-09-27 20:51:05 +02:00
commit c640fd779d
72 changed files with 670 additions and 2320 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@
#define IMAGE_CONNECT ":/images/connect_friend.png"
#define IMAGE_COPYLINK ":/images/copyrslink.png"
#define IMAGE_GROUP16 ":/images/user/group16.png"
#define IMAGE_EDIT ":/images/edit_16.png"
#define IMAGE_EDIT ":/icons/png/pencil-edit-button.png"
#define IMAGE_REMOVE ":/images/delete.png"
#define IMAGE_EXPAND ":/images/edit_add24.png"
#define IMAGE_COLLAPSE ":/images/edit_remove24.png"