-
Jussi Kukkonen authored
Merge branch 'master' of ssh://git.freedesktop.org/git/geoclue Conflicts: backend/position_manual/geoclue_position_server_manual.h
2f1eb688
Merge branch 'master' of ssh://git.freedesktop.org/git/geoclue Conflicts: backend/position_manual/geoclue_position_server_manual.h