diff options
| author | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
|---|---|---|
| committer | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
| commit | 2a53df4444cb8a931e82c584288025e315f40121 (patch) | |
| tree | 7c8b9bfa69cf613a22ba6be616a0d3fdb4146e4e /.gitignore | |
| parent | 294d46a917b6aa3af305c3d50b8d83a1f3fb5694 (diff) | |
| parent | e64d4e31146b87046916c377557f8ea789da3f0a (diff) | |
Merge branch 'debian/master' into ubuntu/precise
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,5 +1,6 @@ /Makefile.in /aclocal.m4 +/autom4te.cache/ /build-aux/ /client/wallet /client/wallet-rekey |