aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-01-21 15:38:59 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2011-01-21 15:38:59 +0100
commitb291f317dc714075c8c9a7ec5d9589e8db6a3f7a (patch)
treee05d91688134e6363d983c67ee43fe28e86ead01 /.gitignore
parent29e49724d6ea4408bd94dbe0f90ac298a813b338 (diff)
parentef31bee06ce4517e83de01f9f13f6c96a77a0b5f (diff)
downloadosm-xapi-b291f317dc714075c8c9a7ec5d9589e8db6a3f7a.tar.gz
osm-xapi-b291f317dc714075c8c9a7ec5d9589e8db6a3f7a.tar.xz
osm-xapi-b291f317dc714075c8c9a7ec5d9589e8db6a3f7a.zip
Merge branch 'master', remote branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1608301..c093b4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,3 @@ usr/
ehthumbs.db
Icon?
Thumbs.db
-