From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 27 Jul 2009 07:35:49 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.15~82
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/019329817761c2c594e97cf20258c48096f28116?hp=4b80bb5f9c43919fb86fd4c144280ac9246d20c8

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/.gitignore b/.gitignore
index 57991a732..8de36e2c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,10 @@ ikiwiki.out
 pm_to_blib
 *.man
 build-stamp
+po/po2wiki_stamp
+po/underlays/*/*.mdwn
+po/underlays/basewiki/*/*.mdwn
+po/underlays/basewiki/*/*/*.mdwn
+po/underlays/directives/ikiwiki/directive/*.mdwn
+po/underlays_copy_stamp
+underlays/locale
diff --git a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
index 18f14d275..1d24fd385 100644
--- a/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
+++ b/doc/todo/generated_po_stuff_not_ignored_by_git.mdwn
@@ -3,3 +3,5 @@
 
 The recent merge of the po branch didn't come with a .gitignore.
 It eventually annoyed me enough to fix it :-) --[[smcv]]
+
+[[done]]