Merge remote-tracking branch 'g1o/qml_app_chat_aesthetic' into qml_app_chat_aesthetic

This commit is contained in:
Angela Mazzurco 2017-06-21 15:24:06 +02:00
commit 8adadd67c2

View File

@ -1,6 +1,6 @@
!include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri")
QT += core network qml quick QT += core network qml quick svg
CONFIG += c++11 CONFIG += c++11