Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a13320648766586b8e3b8050fa1d4582437b2bb6..23bcdb1c6b08a00b8367320430f829be4bba95f6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,13 @@
 *.log
 *.pyc
 *.log
 *.pyc

+*.swp

 
 

-nominatim/*.d
-nominatim/*.o
-nominatim/nominatim
-module/nominatim.so
-module/nominatim.o
-settings/configuration.txt
-settings/download.lock
-settings/state.txt
-settings/local.php
+docs/develop/*.png
+site-html

 
 

-.deps/
-autom4te.cache/
-config.*
-configure
-Makefile
-!tests/scenes/bin/Makefile
-Makefile.in
-stamp-h1
-missing
-INSTALL
-aclocal.m4
-depcomp
-install-sh
-compile
-
-data/wiki_import.sql
-data/wiki_specialphrases.sql
-data/osmosischange.osc
+build
+dist
+.coverage

 
 

+.vagrant
+data/country_osm_grid.sql.gz