]> git.openstreetmap.org Git - nominatim.git/commit
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)
commit6fc32d9645f98ec39c8773d6bf01cc2f6d4969de
treed13a3beab0239a847c89393124f3a716c1f65c88
parent279ea25e7debfeef06a0247d55499ee02b6b4de6
parent5ccb499a6f389913fe8c8c745a31dff40907b98c
Merge branch 'cmake-port' into master

Conflicts:
CMakeLists.txt
lib/init.php
settings/settings.php
website/reverse.php
website/search.php