aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2015-06-28 03:38:54 -0400
committerJack Lloyd <[email protected]>2015-06-28 03:38:54 -0400
commit44002b81a9fb7118e81fea3b7998312bf4784ce9 (patch)
tree153f289d1fb14b051ac3c91f35410f1b5ebc95e1
parentdacc3733305ede05a20c428b0a1f2a704873483a (diff)
parent461fa58bbb57ab52a08fb362fd8bd5758f1dd9de (diff)
Merge branch 'master' of github.com:randombit/botan
-rw-r--r--.gitignore8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 9ccc98e68..3c7db89c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
Makefile*
libbotan*.so.*
-botan_all.cpp
-botan_all.h
*.a
*.so
*.exp
@@ -13,3 +11,9 @@ build
build.log
botan
botan-test
+
+# Amalgamation code
+botan_all.h
+botan_all_internal.h
+botan_all.cpp
+botan_all_*.cpp