Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1c7d233eee573b53d84bfef74241a9452d3b5ba7..b662591271ecfa6f4210d785c480787c5f517d11 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 *.log
+*.pyc
 
 nominatim/*.d
 nominatim/*.o
 nominatim/nominatim
 module/nominatim.so
+module/nominatim.o
 settings/configuration.txt
 settings/download.lock
 settings/state.txt
@@ -14,8 +16,18 @@ 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
+
+.vagrant
\ No newline at end of file