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

diff --git a/.gitignore b/.gitignore
index 57991a732d698238d8af3ac0e6094d7c445974a9..8de36e2c8df25ab30f7fadeffbcdf25f189863f3 100644 (file)
--- 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 18f14d275bcaf2c76c0f8acfcad9c632fcc16a33..1d24fd3856b51952ce28a6b9acb33d5b3664e71f 100644 (file)
--- 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]]