summaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-08-19 16:39:18 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-08-19 16:39:18 +0200
commitc417d953f743b8a273ea36ff7d7b1dc8b761d518 (patch)
tree4bc08bf733ba04a7846db8289ba7003a961bad82 /Changelog
parentc53747138d2f48138ee6e12149064344e668634d (diff)
parentd343cd20410ecb2741c85877c8203579dc7c227d (diff)
Merge remote-tracking branch 'origin/2.0'
Conflicts: Changelog dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri src/libs/installer/component.cpp src/libs/kdtools/updatesinfo.cpp Change-Id: I0a1b4a464f7d9008b589b54dd7aed0cac71bd666
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog7
1 files changed, 7 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 51eb2d129..2892eb68e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,12 @@
2.1.0
+2.0.2
+- Fix .dat file that gets deleted after multiple component changes on Windows.
+- Fix maintenance tool upgrade on OS X.
+- Unify selection of language for translations. (QTIFW-390)
+- Fix return value of component.installAction() when updating. (QTIFW-727)
+- Documentation updates.
+
2.0.1
- Do not throw exception on empty translation files.
- Fix --checkupdates mode.