Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a13320648766586b8e3b8050fa1d4582437b2bb6..44b8eb32203dfeb897a8f4d3a1243c7a536b6ee1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,32 +1,12 @@
 *.log
 *.pyc
 
 *.log
 *.pyc
 

-nominatim/*.d
-nominatim/*.o
-nominatim/nominatim
-module/nominatim.so
-module/nominatim.o
-settings/configuration.txt
-settings/download.lock
-settings/state.txt
+build

 settings/local.php
 
 settings/local.php
 

-.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
 
 data/wiki_import.sql
 data/wiki_specialphrases.sql
 data/osmosischange.osc
 

+.vagrant
+data/country_osm_grid.sql.gz