diff options
author | Jeff Garzik <jeff@garzik.org> | 2011-05-09 14:00:14 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-05-09 14:00:14 -0400 |
commit | b17be7e14b4a62b7935c75fe7e7645e736fd68d2 (patch) | |
tree | be44c7310683df72aeb5781ec74a85451206cfbc /.gitignore | |
parent | c0430f42b868dbf996a416d3a9d81d1c8c07e47c (diff) | |
parent | 84c3fb07b0b8199c7f85c5de280e7100bad0786f (diff) | |
download | bitcoin-b17be7e14b4a62b7935c75fe7e7645e736fd68d2.tar.xz |
Manual merge of jaromil's source tree reorg commit.
Conflicts:
src/sha256.cpp
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 1990117cfd..eec3751aa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -*.exe -bitcoin -bitcoind +src/*.exe +src/bitcoin +src/bitcoind |