aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-07 18:57:11 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-07 18:57:11 +0200
commita0d2f9a12dad7b33a3f12d85dee8afa4155dbc99 (patch)
tree24a475fe47ed00837fbed1836d03d933cfe7dbb2 /.gitignore
parentf077d1ad62cba26b2620c87abba87be7fec15f0d (diff)
parentf92f022edaa2f14951b9ce8304a304ff9693ae16 (diff)
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts: .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 537064d30e..29c781c016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,12 @@ src/bitcoin
src/bitcoind
.*.swp
*.*~*
+*.bak
+*.rej
+*.orig
+*.o
+*.patch
+.bitcoin
#compilation and Qt preprocessor part
*.o
ui_*.h
@@ -11,4 +17,4 @@ moc_*
Makefile
bitcoin-qt
#resources cpp
-qrc_*.cpp \ No newline at end of file
+qrc_*.cpp