Merge disorder.macros branch.

[disorder] / .bzrignore

diff --git a/.bzrignore b/.bzrignore
index c701a861deedd82f353e51cff1ca8897bb3d178e..b3032ad5d17cf4d14e86ae2bb8821ccfbd478d73 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -185,3 +185,5 @@ doc/disorder_actions.5
 doc/disorder_actions.5.html
 doc/disorder_options.5
 doc/disorder_options.5.html
+doc/disorder_actions.5.in
+doc/disorder_templates.5.in