Update and Merge all git ignores.

OrenAudeles · Feb 2, 2014 · c0a64c0 · c0a64c0
1 parent 68767fb
commit c0a64c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,19 @@ CataclysmWin.layout
 *.exe
 *.dll
 WinDepend/
+*.7z
+*.zip
+
+data/font/
+data/keymap.txt
+data/options.txt
+data/auto_pickup.txt
+data/fontlist.txt
 data/FONTDATA
 
+doxygen_doc/html/*
+doxygen_doc/latex/*
+
 # Visual Studio files
 *.suo
 *.sdf

diff --git a/data/.gitignore b/data/.gitignore
diff --git a/doxygen_doc/.gitignore b/doxygen_doc/.gitignore