my project file
Merge branch 'master' of https://github.com/niosus/OSMViewer

Conflicts:
	map_test.pro.user