mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fixed merging bug
This commit is contained in:
parent
f959218a24
commit
f6b7d1e9a3
@ -566,7 +566,7 @@ HEADERS += rshare.h \
|
||||
util/RsSyntaxHighlighter.h \
|
||||
util/imageutil.h \
|
||||
gui/NetworkDialog/pgpid_item_model.h \
|
||||
gui/NetworkDialog/pgpid_item_proxy.h
|
||||
gui/NetworkDialog/pgpid_item_proxy.h \
|
||||
gui/common/RsCollection.h
|
||||
# gui/ForumsDialog.h \
|
||||
# gui/forums/ForumDetails.h \
|
||||
@ -927,7 +927,7 @@ SOURCES += main.cpp \
|
||||
util/RsSyntaxHighlighter.cpp \
|
||||
util/imageutil.cpp \
|
||||
gui/NetworkDialog/pgpid_item_model.cpp \
|
||||
gui/NetworkDialog/pgpid_item_proxy.cpp
|
||||
gui/NetworkDialog/pgpid_item_proxy.cpp \
|
||||
gui/common/RsCollection.cpp
|
||||
# gui/ForumsDialog.cpp \
|
||||
# gui/forums/ForumDetails.cpp \
|
||||
|
Loading…
Reference in New Issue
Block a user