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

merged upstream/master

Browse source
This commit is contained in:
csoler 2020-02-18 22:23:55 +01:00
commit d3bd237cde
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
retroshare-gui/src/retroshare-gui.pro
View file

@ -1418,9 +1418,6 @@ gxsgui {
gui/gxs/GxsMessageFramePostWidget.h \ gui/gxs/GxsMessageFramePostWidget.h \
gui/gxs/GxsGroupFeedItem.h \ gui/gxs/GxsGroupFeedItem.h \
gui/gxs/GxsFeedItem.h \ gui/gxs/GxsFeedItem.h \
# gui/gxs/RsGxsUpdateBroadcastBase.h \
# gui/gxs/RsGxsUpdateBroadcastWidget.h \
# gui/gxs/RsGxsUpdateBroadcastPage.h \
gui/gxs/GxsGroupShareKey.h \ gui/gxs/GxsGroupShareKey.h \
gui/gxs/GxsUserNotify.h \ gui/gxs/GxsUserNotify.h \
gui/gxs/GxsFeedWidget.h \ gui/gxs/GxsFeedWidget.h \
@ -1455,9 +1452,6 @@ gxsgui {
gui/gxs/GxsMessageFramePostWidget.cpp \ gui/gxs/GxsMessageFramePostWidget.cpp \
gui/gxs/GxsGroupFeedItem.cpp \ gui/gxs/GxsGroupFeedItem.cpp \
gui/gxs/GxsFeedItem.cpp \ gui/gxs/GxsFeedItem.cpp \
# gui/gxs/RsGxsUpdateBroadcastBase.cpp \
# gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
# gui/gxs/RsGxsUpdateBroadcastPage.cpp \
gui/gxs/GxsUserNotify.cpp \ gui/gxs/GxsUserNotify.cpp \
gui/gxs/GxsFeedWidget.cpp \ gui/gxs/GxsFeedWidget.cpp \
util/TokenQueue.cpp \ util/TokenQueue.cpp \
@ -1467,3 +1461,16 @@ gxsgui {
} }
wikipoos {
HEADERS += \
gui/gxs/RsGxsUpdateBroadcastBase.h \
gui/gxs/RsGxsUpdateBroadcastWidget.h \
gui/gxs/RsGxsUpdateBroadcastPage.h
SOURCES += \
gui/gxs/RsGxsUpdateBroadcastBase.cpp \
gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
gui/gxs/RsGxsUpdateBroadcastPage.cpp \
}