mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Merge branch 'master' of https://github.com/defnax/RetroShare
This commit is contained in:
commit
e670e7c4f5
91
.gitignore
vendored
91
.gitignore
vendored
@ -12,94 +12,3 @@ Thumbs.db
|
||||
*.pro.user
|
||||
.kdev4
|
||||
*.kdev4
|
||||
*.a
|
||||
*.Release
|
||||
*.Debug
|
||||
*.txt
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/config/banlist.cfg.sgn
|
||||
*.sgn
|
||||
*.tmp
|
||||
*.gpg
|
||||
*.png
|
||||
*.dll
|
||||
*.acs
|
||||
*.types
|
||||
*.qss
|
||||
*.wav
|
||||
*.sh
|
||||
*.qm
|
||||
*.qm
|
||||
*.cfg
|
||||
*.bin
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/gxschannels_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/gxscircles_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/gxsforums_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/gxsid_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/gxstrans_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/gxs/posted_db
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/keys/help.dta
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/keys/ssl_passphrase.pgp
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/keys/user_cert.pem
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/keys/user_pk.pem
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/lock
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/retro.log
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/retro.log-save
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/RetroShare.conf
|
||||
retroshare-gui/src/release/Data/LOC06_8bc54cead7d90f739e13788417a28bff/RSPeers.conf
|
||||
retroshare-gui/src/release/Data/pgp/lock
|
||||
retroshare-gui/src/release/portable
|
||||
retroshare-gui/src/release/retroshare.exe
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/hincoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/houtgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/incoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/info.xml
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/main.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/ooutgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/outgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/system.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/variants/color.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/history/variants/standard.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/hincoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/houtgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/incoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/info.xml
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/main.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/ooutgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/outgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/system.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/variants/color.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/private/variants/standard.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/hincoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/houtgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/incoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/info.xml
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/main.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/ooutgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/outgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/system.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/variants/color.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/public/variants/standard.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble/src/img.svg
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/hincoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/houtgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/incoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/info.xml
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/Kopie von incoming.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/main.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/ooutgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/outgoing.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/system.htm
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/variants/color.css
|
||||
retroshare-gui/src/release/stylesheets/Bubble_Compact/private/variants/standard.css
|
||||
retroshare-gui/src/release/webui/app.css
|
||||
retroshare-gui/src/release/webui/app.css.map
|
||||
retroshare-gui/src/release/webui/app.js
|
||||
retroshare-gui/src/release/webui/app.js.map
|
||||
retroshare-gui/src/release/webui/index.html
|
||||
retroshare-gui/src/temp/moc/moc_predefs.h
|
||||
retroshare-gui/src/temp/moc/Settings.moc
|
||||
retroshare-gui/src/temp/moc/TorControl.moc
|
||||
retroshare-gui/src/temp/moc/TorManager.moc
|
||||
retroshare-nogui/src/release/retroshare-nogui.exe
|
||||
sh.exe.stackdump
|
||||
*.stash
|
||||
|
Loading…
Reference in New Issue
Block a user