mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fixed merge
This commit is contained in:
parent
5915c27b9f
commit
d91a2d31e8
@ -1373,11 +1373,10 @@ gxschannels {
|
|||||||
gui/feeds/GxsChannelPostItem.ui
|
gui/feeds/GxsChannelPostItem.ui
|
||||||
|
|
||||||
SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
|
SOURCES += gui/gxschannels/GxsChannelDialog.cpp \
|
||||||
gui/gxschannels/GxsChannelPostsModel.cpp \
|
|
||||||
gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
|
gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp \
|
||||||
|
gui/gxschannels/GxsChannelPostsModel.cpp \
|
||||||
gui/gxschannels/GxsChannelPostFilesModel.cpp \
|
gui/gxschannels/GxsChannelPostFilesModel.cpp \
|
||||||
gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
|
gui/gxschannels/GxsChannelFilesStatusWidget.cpp \
|
||||||
gui/gxschannels/GxsChannelFilesWidget.cpp \
|
|
||||||
gui/gxschannels/GxsChannelPostThumbnail.cpp \
|
gui/gxschannels/GxsChannelPostThumbnail.cpp \
|
||||||
gui/gxschannels/GxsChannelGroupDialog.cpp \
|
gui/gxschannels/GxsChannelGroupDialog.cpp \
|
||||||
gui/gxschannels/CreateGxsChannelMsg.cpp \
|
gui/gxschannels/CreateGxsChannelMsg.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user