mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-17 02:49:19 +00:00
5e322a72f9
Conflicts: .gitignore src/bitcoinrpc.cpp src/main.cpp src/qt/bitcoingui.cpp src/ui_interface.h src/util.cpp
25 lines
258 B
Plaintext
25 lines
258 B
Plaintext
src/*.exe
|
|
src/bitcoin
|
|
src/bitcoind
|
|
src/test_bitcoin
|
|
src/build.h
|
|
.*.swp
|
|
*.*~*
|
|
*.bak
|
|
*.rej
|
|
*.orig
|
|
*.o
|
|
*.patch
|
|
.bitcoin
|
|
#compilation and Qt preprocessor part
|
|
*.qm
|
|
Makefile
|
|
bitcoin-qt
|
|
#resources cpp
|
|
qrc_*.cpp
|
|
#qt creator
|
|
*.pro.user
|
|
#mac specific
|
|
.DS_Store
|
|
build
|