Merge errors, these should be removed
authorTobias Nätterlund <tobias.naetterlund@kdab.com>
Wed, 16 May 2012 11:45:55 +0000 (13:45 +0200)
committerTobias Nätterlund <tobias.naetterlund@kdab.com>
Wed, 16 May 2012 11:45:55 +0000 (13:45 +0200)
commit22609cde61824d7261ee42de8ec6c99932797935
tree1e7e3b0fceb4a1629a86b7290a468958f63372c3
parente3e857a3ce26d0a398d5baa3eb6f377be1733a41
Merge errors, these should be removed
26 files changed:
share/qtcreator/templates/wizards/qnx-bardescriptor/bar-descriptor.xml [deleted file]
share/qtcreator/templates/wizards/qnx-bardescriptor/icon.png [deleted file]
share/qtcreator/templates/wizards/qnx-bardescriptor/splashscreen.png [deleted file]
share/qtcreator/templates/wizards/qnx-bardescriptor/wizard.xml [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/bar-descriptor.xml [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/icon.png [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/main.cpp [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/mainwidget.cpp [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/mainwidget.h [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/mainwidget.ui [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/project.pro [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/splashscreen.png [deleted file]
share/qtcreator/templates/wizards/qnx-guiapp/wizard.xml [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/bar-descriptor.xml [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/icon.png [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/main.cpp [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/project.pro [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/qml/main.qml [deleted file]
share/qtcreator/templates/wizards/qnx-qt5-quick2app/wizard.xml [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/bar-descriptor.xml [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/icon.png [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/main.cpp [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/project.pro [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/qml/main.qml [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/splashscreen.png [deleted file]
share/qtcreator/templates/wizards/qnx-quickapp/wizard.xml [deleted file]