From 5fe965f7e9109f516edb3434c23b235dbee5a4f1 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 9 Apr 2015 08:20:48 +0200
Subject: [PATCH] Alle .gitignore-Dateien in Top-Level-.gitignore gemerget und
 diese sortiert

---
 .gitignore                                    | 36 ++++++++++++-------
 config/.gitignore                             |  3 --
 locale/de/.gitignore                          |  2 --
 locale/en/.gitignore                          |  2 --
 templates/.gitignore                          |  1 -
 users/.gitignore                              |  6 ----
 users/.openoffice.org2/user/config/.gitignore |  1 -
 .../.openoffice.org2/user/psprint/.gitignore  |  1 -
 .../.openoffice.org2/user/registry/.gitignore |  1 -
 9 files changed, 24 insertions(+), 29 deletions(-)
 delete mode 100644 config/.gitignore
 delete mode 100644 locale/de/.gitignore
 delete mode 100644 locale/en/.gitignore
 delete mode 100644 templates/.gitignore
 delete mode 100644 users/.gitignore
 delete mode 100644 users/.openoffice.org2/user/config/.gitignore
 delete mode 100644 users/.openoffice.org2/user/psprint/.gitignore
 delete mode 100644 users/.openoffice.org2/user/registry/.gitignore

diff --git a/.gitignore b/.gitignore
index 941e1c722..7ade8b1cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,28 @@
-tags
-crm
-/users/datev-export*
-/users/templates-cache/
-/users/session_files/
-/users/pid/
-/users/.cache/
-/users/kivitendo-print*
-users/.openoffice.org2/
-/config/lx_office.conf
+/config/authentication.pl
+/config/console.conf
 /config/kivitendo.conf
-/doc/online/*/*.html
-pod2html*
+/config/lx-erp-local.conf
+/config/lx_office.conf
 /doc/build/dobudish*
+/doc/online/*/*.html
+/locale/*/missing
+/locale/*/lost
 /spool/*
+/templates/demo*
+/users/*_finanzamt.ini
+/users/.cache/
+/users/.fonts.cache*
+/users/.openoffice.org2/
+/users/.recently-used
+/users/.texmf-var
+/users/console_history
+/users/datev-export*
+/users/kivitendo-print*
+/users/pid/
+/users/session_files/
+/users/templates-cache/
+/users/xvfb_display
 /webdav/*
+crm
+pod2html*
+tags
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 401467c34..000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-lx-erp-local.conf
-authentication.pl
-console.conf
diff --git a/locale/de/.gitignore b/locale/de/.gitignore
deleted file mode 100644
index ccdb7e2e0..000000000
--- a/locale/de/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-missing
-lost
diff --git a/locale/en/.gitignore b/locale/en/.gitignore
deleted file mode 100644
index ccdb7e2e0..000000000
--- a/locale/en/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-missing
-lost
diff --git a/templates/.gitignore b/templates/.gitignore
deleted file mode 100644
index ab6f88411..000000000
--- a/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-demo*
diff --git a/users/.gitignore b/users/.gitignore
deleted file mode 100644
index 141edb542..000000000
--- a/users/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.recently-used
-.fonts.cache*
-*_finanzamt.ini
-xvfb_display
-console_history
-.texmf-var
diff --git a/users/.openoffice.org2/user/config/.gitignore b/users/.openoffice.org2/user/config/.gitignore
deleted file mode 100644
index 940afb47a..000000000
--- a/users/.openoffice.org2/user/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-imagecache
diff --git a/users/.openoffice.org2/user/psprint/.gitignore b/users/.openoffice.org2/user/psprint/.gitignore
deleted file mode 100644
index babcd73f3..000000000
--- a/users/.openoffice.org2/user/psprint/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pspfontcache
diff --git a/users/.openoffice.org2/user/registry/.gitignore b/users/.openoffice.org2/user/registry/.gitignore
deleted file mode 100644
index 06cf65390..000000000
--- a/users/.openoffice.org2/user/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cache
-- 
2.20.1