Merge branch 'master' into map_double_click_zoom
[situare] / tests /
drwxr-xr-x   ..
drwxr-xr-x - map
-rw-r--r-- 342 tests.pro
drwxr-xr-x - ui
drwxr-xr-x - user