Files
bitcoin/.gitignore
Luke Dashjr a49927a46d Merge branch '0.6.0.x' into 0.6.x
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/bitcoinrpc.h
	src/db.h
	src/headers.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/noui.h
	src/qt/bitcoin.cpp
	src/qt/locale/bitcoin_en.ts
	src/qt/walletmodel.cpp
	src/script.cpp
	src/ui_interface.h
	src/util.cpp
2012-05-22 23:07:46 +00:00

24 lines
241 B
Plaintext

src/*.exe
src/bitcoin
src/bitcoind
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