Merge branch 'feature/welcome'
Conflicts:
Client/UI.pro
Client/carmainwindow.cpp
xmlwriter.cpp \
xmlreader.cpp \
httpclient.cpp \
- categorylist.cpp
++ categorylist.cpp \
+ welcomedialog.cpp
++
HEADERS += carmainwindow.h \
resultdialog.h \
stringlistmodel.h \
xmlwriter.h \
xmlreader.h \
httpclient.h \
- categorylist.h
++ categorylist.h \
+ welcomedialog.h
++
FORMS += carmainwindow.ui \
resultdialog.ui \
measuredialog.ui \
delete xmlreader;
delete xmlwriter;
delete manager;
+ delete categorylist;
+ delete welcomeDialog;
}
/**