aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJoachim Tingvold <joachim@tingvold.com>2016-03-02 23:52:04 +0100
committerJoachim Tingvold <joachim@tingvold.com>2016-03-02 23:52:04 +0100
commit5a3e62c0125aaa79c5f19694603b0c4795d782a7 (patch)
tree06ea7e03f70739e5695c46fd0f7143838ae50706 /.gitignore
parent2c625018a15e628f82e91126eb544d7af4dd5088 (diff)
More cleanup.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore25
1 files changed, 20 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 02ad0bf..4856487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+web/.htpasswd
+web/.htpasswd.munin
web/stream.gathering.org/hls
web/stream.gathering.org/chiobe
web/nms-public.gathering.org/nettkart-dhcp.png
@@ -12,12 +14,10 @@ working-area/
include/config.pm
include/tgmanage.cfg.sh
planning/planning
-web/.htpasswd
-web/.htpasswd.munin
fap/tools/generate_distro_config_ae_event-options/
-*.swp
+nms/build/
-# Stupid system files
+# OS-crap
.DS_Store
.DS_Store?
._*
@@ -25,4 +25,19 @@ fap/tools/generate_distro_config_ae_event-options/
.Trashes
ehthumbs.db
Thumbs.db
-.idea/
+desktop.ini
+*.swp
+*.swo
+.vimrc
+**/*~
+**/*.bak
+**/*.sw[abcdefghijklmnop]
+
+# IDE-stuff
+.classpath
+.project
+.settings
+.idea
+.metadata
+*.iml
+*.ipr \ No newline at end of file