From 5bc1d37d31230d7e12f711acaf0b9d1928572840 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Fri, 14 Sep 2012 05:17:11 +0200
Subject: gitignore: global gitignore, ignore autogenerated index.html and
 password file

---
 .gitignore        | 5 +++++
 htdocs/.gitignore | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 htdocs/.gitignore

diff --git a/.gitignore b/.gitignore
index 2c21dac..39059a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,7 @@
 log/
 var/
+tmp/
+etc/htpasswd
+htdocs/imgs/
+htdocs/sites/
+htdocs/index.html
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
deleted file mode 100644
index 48f8b0a..0000000
--- a/htdocs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-imgs/
-sites/
-- 
cgit v1.2.3-1-g7c22