]> git.openstreetmap.org Git - nominatim.git/commit
Merge branch 'master' of http://github.com/twain47/Nominatim
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 8 Aug 2012 20:34:06 +0000 (22:34 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 8 Aug 2012 20:34:06 +0000 (22:34 +0200)
commit932d945b7f897fd18be7d4c2fac3eda3915aa296
treea8438c44a072228d2a11ae2721927780ece08d7c
parent0c714f12b4137017e842a10cda0f47839a84dfb9
parent8ebc673ebf9ed3ceb2f278d2c0e42b836a34a37c
Merge branch 'master' of http://github.com/twain47/Nominatim

Conflicts:
lib/lib.php
lib/log.php
lib/template/address-jsonv2.php
settings/settings.php
sql/functions.sql
sql/indices.src.sql
sql/tables.sql
utils/setup.php
utils/specialphrases.php
website/reverse.php
lib/log.php
settings/settings.php
sql/indices.src.sql
sql/partitions.src.sql
sql/tables.sql
utils/setup.php
utils/specialphrases.php
website/reverse.php
website/search.php