diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-15 09:56:46 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-15 09:56:46 +0200 |
commit | af662682790e8695cb65bf14d7a652dc527ce73d (patch) | |
tree | baa1d1776832e10d85da7c369d64d2ad36777ac0 | |
parent | c66892ef24ade4c20225ae2fb3edac33dea9651a (diff) | |
parent | a61337c6207ccbe372fd301934a4958e4111c8e7 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
* origin/5.5:
Doc: Bump version to 5.5.1
Conflicts:
doc/b2qt-demos.qdocconf
Change-Id: I5121d0506fe2ce3990be457bb4dbd28252676311
0 files changed, 0 insertions, 0 deletions