Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-16 00:53:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merging bug

Browse source
This commit is contained in:
csoler 2017-10-24 22:12:38 +02:00
parent f959218a24
commit f6b7d1e9a3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -566,7 +566,7 @@ HEADERS += rshare.h \
util/RsSyntaxHighlighter.h \ util/RsSyntaxHighlighter.h \
util/imageutil.h \ util/imageutil.h \
gui/NetworkDialog/pgpid_item_model.h \ gui/NetworkDialog/pgpid_item_model.h \
gui/NetworkDialog/pgpid_item_proxy.h gui/NetworkDialog/pgpid_item_proxy.h \
gui/common/RsCollection.h gui/common/RsCollection.h
# gui/ForumsDialog.h \ # gui/ForumsDialog.h \
# gui/forums/ForumDetails.h \ # gui/forums/ForumDetails.h \
@ -927,7 +927,7 @@ SOURCES += main.cpp \
util/RsSyntaxHighlighter.cpp \ util/RsSyntaxHighlighter.cpp \
util/imageutil.cpp \ util/imageutil.cpp \
gui/NetworkDialog/pgpid_item_model.cpp \ gui/NetworkDialog/pgpid_item_model.cpp \
gui/NetworkDialog/pgpid_item_proxy.cpp gui/NetworkDialog/pgpid_item_proxy.cpp \
gui/common/RsCollection.cpp gui/common/RsCollection.cpp
# gui/ForumsDialog.cpp \ # gui/ForumsDialog.cpp \
# gui/forums/ForumDetails.cpp \ # gui/forums/ForumDetails.cpp \