diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-28 21:52:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-28 21:52:32 +0200 |
| commit | 002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0 (patch) | |
| tree | 58a16a226571a80537bfa7e3b1147aa4d0ee8767 /.gitignore | |
| parent | a8b95ce6ed5e84d34748ecdd0ff1db4d03377cf0 (diff) | |
| parent | 4dcad1d294e264a81280fd007d1508d9bd4f0273 (diff) | |
| download | bitcoin-002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
.gitignore (used upstream version)
bitcoin-qt.pro
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 08dfd0016d..66f93867d8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,11 +10,7 @@ src/bitcoind *.patch .bitcoin #compilation and Qt preprocessor part -*.o -ui_*.h *.qm -moc_* -*.moc Makefile bitcoin-qt #resources cpp |