gitignore: Merge rules from doc/ and data/tools

wesnoth · Jun 8, 2014 · c19e729 · c19e729
1 parent 1715ab3
commit c19e729
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -129,6 +129,15 @@ po/**/Makefile*
 !po/wesnoth-manpages/Makefile
 !po/wesnoth-manual/Makefile
 
+# tools
+data/tools/unit_tree/**/files
+data/tools/unit_tree/**/reports
+data/tools/unit_tree/**/Locale
+
+# doc
+doc/doxygen/**/html
+doc/manual/**/*.xml
+
 # file for loading lua from within test scenario on-the-fly
 data/lua/**/code.lua
 

diff --git a/data/tools/.gitignore b/data/tools/.gitignore
diff --git a/data/tools/unit_tree/.gitignore b/data/tools/unit_tree/.gitignore
diff --git a/data/tools/wesnoth/.gitignore b/data/tools/wesnoth/.gitignore
diff --git a/doc/.gitignore b/doc/.gitignore
diff --git a/doc/design/.gitignore b/doc/design/.gitignore
diff --git a/doc/doxygen/.gitignore b/doc/doxygen/.gitignore
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore
diff --git a/doc/manual/images/.gitignore b/doc/manual/images/.gitignore