Conflicts:
src/ui/mapviewscreen.cpp
map/mapscene.h \
map/maptile.h \
map/mapfetcher.h \
- common.h \
+ map/mapcommon.h \
ui/pixmap.h \
- ui/infotab.h
+ ui/infotab.h \
+ ui/updatelocation/updatelocationdialog.h \
+ ui/updatelocation/texteditautoresizer.h \
+ situareservice/situareservice.h \
+ situareservice/situarecommon.h \
+ cookiehandler/cookiehandler.h \
+ facebookservice/facebookcredentials.h \
+ facebookservice/facebookauthentication.h \
+ facebookservice/facebookcommon.h
QT += network \
webkit