aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-01-21 14:39:13 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2011-01-21 14:39:13 +0100
commit7afd4f2c8d623459f4b4d92a38571408ab2daf04 (patch)
tree773e6ae156d07b5c07a4cd61117b250b3ef5dd01 /.gitignore
parentc48ace3cb001659a88483ba5fd4ba3a7721d5c25 (diff)
parent570d3aa1c9bdebfdbf172f0873d7cda94b89fcaf (diff)
downloadosm-xapi-7afd4f2c8d623459f4b4d92a38571408ab2daf04.tar.gz
osm-xapi-7afd4f2c8d623459f4b4d92a38571408ab2daf04.tar.xz
osm-xapi-7afd4f2c8d623459f4b4d92a38571408ab2daf04.zip
Merge remote branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 14 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1608301
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+usr/
+
+# Temp Files #
+##############
+*.swp
+
+
+# OS generated files #
+######################
+*.DS_Store
+ehthumbs.db
+Icon?
+Thumbs.db
+