]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 279ea25 5ccb499)
Merge branch 'cmake-port' into master
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 16 Mar 2016 18:45:18 +0000 (19:45 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 16 Mar 2016 18:45:18 +0000 (19:45 +0100)
Conflicts:
CMakeLists.txt
lib/init.php
settings/settings.php

1  2 
website/reverse.php patch | diff1 | diff2 | blob | history
website/search.php patch | diff1 | diff2 | blob | history

diff --cc website/reverse.php
Simple merge
diff --cc website/search.php
Simple merge
Open Source search based on OpenStreetMap data