summaryrefslogtreecommitdiff
path: root/qtcreator.pro
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-09-15 11:50:29 +0200
committerEike Ziller <eike.ziller@nokia.com>2011-09-15 11:50:29 +0200
commitb0efd44d20e9129c40b47ad3715c248962a947b9 (patch)
tree4415eccb62e5fca5bf1f83d19f1cdaad6ca339e7 /qtcreator.pro
parent8801c76a8e223b6f41a8369e75c71b67237d8d25 (diff)
parent33cd873d56f948b4805da31adaf436618ac7edac (diff)
downloadqt-creator-b0efd44d20e9129c40b47ad3715c248962a947b9.tar.gz
Merge remote-tracking branch 'origin/2.3'
Conflicts: qtcreator.pri qtcreator.pro share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp src/plugins/qt4projectmanager/qt4buildconfiguration.cpp src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp src/plugins/remotelinux/remotelinuxruncontrol.cpp Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
Diffstat (limited to 'qtcreator.pro')
-rw-r--r--qtcreator.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/qtcreator.pro b/qtcreator.pro
index 12c8f3fa8b..3e15415c76 100644
--- a/qtcreator.pro
+++ b/qtcreator.pro
@@ -26,4 +26,5 @@ OTHER_FILES += dist/copyright_template.txt \
dist/changes-2.1.0 \
dist/changes-2.2.0 \
dist/changes-2.3.0 \
+ dist/changes-2.3.1 \
dist/changes-2.4.0