Merge branch 'master' into openpgp

This commit is contained in:
James Booth
2015-06-12 23:08:43 +01:00

1
.gitignore vendored
View File

@@ -29,6 +29,7 @@ m4/
**.dirstamp **.dirstamp
src/config.h src/config.h
src/config.h.in src/config.h.in
src/config.h.in~
src/gitversion.h src/gitversion.h
src/gitversion.h.in src/gitversion.h.in
src/stamp-h1 src/stamp-h1