mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
merged upstream/master
This commit is contained in:
commit
d3bd237cde
@ -1418,9 +1418,6 @@ gxsgui {
|
||||
gui/gxs/GxsMessageFramePostWidget.h \
|
||||
gui/gxs/GxsGroupFeedItem.h \
|
||||
gui/gxs/GxsFeedItem.h \
|
||||
# gui/gxs/RsGxsUpdateBroadcastBase.h \
|
||||
# gui/gxs/RsGxsUpdateBroadcastWidget.h \
|
||||
# gui/gxs/RsGxsUpdateBroadcastPage.h \
|
||||
gui/gxs/GxsGroupShareKey.h \
|
||||
gui/gxs/GxsUserNotify.h \
|
||||
gui/gxs/GxsFeedWidget.h \
|
||||
@ -1455,9 +1452,6 @@ gxsgui {
|
||||
gui/gxs/GxsMessageFramePostWidget.cpp \
|
||||
gui/gxs/GxsGroupFeedItem.cpp \
|
||||
gui/gxs/GxsFeedItem.cpp \
|
||||
# gui/gxs/RsGxsUpdateBroadcastBase.cpp \
|
||||
# gui/gxs/RsGxsUpdateBroadcastWidget.cpp \
|
||||
# gui/gxs/RsGxsUpdateBroadcastPage.cpp \
|
||||
gui/gxs/GxsUserNotify.cpp \
|
||||
gui/gxs/GxsFeedWidget.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 \
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user