summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2016-10-14 15:19:59 +0200
committerEike Ziller <eike.ziller@qt.io>2016-10-14 15:20:11 +0200
commitf70d1359c0df15139be96c711b2df6174d09a1ce (patch)
tree15c3981b31fe4c267e13116451cf1caf2ae333b8 /dist
parentd78e87329f9e637de7742cffd167810cc95565cb (diff)
parent614d14274d37941b3dbd432249748efea49380f5 (diff)
downloadqt-creator-f70d1359c0df15139be96c711b2df6174d09a1ce.tar.gz
Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ib5b66f97374a4e330aa6fa9e604378da29290d65
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.1.1.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-4.1.1.md b/dist/changes-4.1.1.md
index 79de654dc2..938843162b 100644
--- a/dist/changes-4.1.1.md
+++ b/dist/changes-4.1.1.md
@@ -51,7 +51,7 @@ QML Profiler
* Separated compile events from other QML/JS events in statistics and
flamegraph, since compilation can happen asynchronously
-Beatifier
+Beautifier
* Fixed that beautifier was not enabled for Objective-C/C++ files
(QTCREATORBUG-16806)