Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2735 from ppetr/master

Browse Source 
Fix misplaced `fsitem.h` in HEADERS and add build artifacts to `.gitignore`
This commit is contained in:
csoler 2023-05-25 10:34:26 +02:00 committed by GitHub
commit 578cafe1e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitignore vendored
View File

@ -16,7 +16,22 @@ Thumbs.db
.kdev4 .kdev4
*.kdev4 *.kdev4
.qmake.stash
!supportlibs/libsam3/Makefile !supportlibs/libsam3/Makefile
# QtCreator cruft # QtCreator cruft
*CMakeLists.txt.user *CMakeLists.txt.user
# Build artifacts
/jsonapi-generator/src/jsonapi-generator
/jsonapi-generator/src/jsonapi-generator-doxygen-final.conf
/jsonapi-generator/src/jsonapi-includes.inl
/jsonapi-generator/src/jsonapi-wrappers.inl
/jsonapi-generator/src/xml/
/retroshare-friendserver/src/retroshare-friendserver
/retroshare-gui/src/include/
/retroshare-gui/src/retroshare
/retroshare-gui/src/temp/
/retroshare-service/src/retroshare-service
/*.tar.?z

3
retroshare-friendserver/src/retroshare-friendserver.pro
View File

@ -29,8 +29,7 @@ SOURCES += retroshare-friendserver.cc \
network.cc network.cc
HEADERS += friendserver.h \ HEADERS += friendserver.h \
network.h \ network.h
fsitem.h
################################# Linux ########################################## ################################# Linux ##########################################

2
retroshare-webui

@ -1 +1 @@
Subproject commit 5cc37b3e5ad6b64b247e9d2066a9b6c8acae67ce Subproject commit b0ddb09184e8fff86bd3325e00c6d4b329ae1790