about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-06-12 23:08:43 +0100
committerJames Booth <boothj5@gmail.com>2015-06-12 23:08:43 +0100
commitd8405cd11f771033f116359605d6dccf495b7efa (patch)
tree77148105cd415c31aa6d3959a976eeb2b19865ba
parentbc2a8b0409e606d6f60450f30739b0623a38189a (diff)
parentc182f3ecd6be5df9b9bc7757930e47b555ddd251 (diff)
downloadprofani-tty-d8405cd11f771033f116359605d6dccf495b7efa.tar.gz
Merge branch 'master' into openpgp
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 001838c8..cf6e3eba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ m4/
 **.dirstamp
 src/config.h
 src/config.h.in
+src/config.h.in~
 src/gitversion.h
 src/gitversion.h.in
 src/stamp-h1