Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7ca6ac2a950214478c89d33e200bd79ed8d667e9..bb02bcb31de37ae41831c6be5c4cf85f9c207a42 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 Makefile
+Makefile.old
 blib/*
 doc/.ikiwiki/*
 html/*
 ikiwiki.out
 pm_to_blib
 *.man
+build-stamp