diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:34:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:34:30 +0200 |
| commit | 1d7b5b2e1c798335e20c7fc269e8f8238505eba0 (patch) | |
| tree | 125ece1cda05867a0fb6a3e67359daa58d050422 /LICENSE.LGPLv21 | |
| parent | e2bcb43fdccf72c12d679ebfd63955bce342d6a7 (diff) | |
| parent | b73a47aa17fcb020ed70fa99c7792210c83ff16f (diff) | |
| download | qttools-1d7b5b2e1c798335e20c7fc269e8f8238505eba0.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/designer/doc/src/arthurplugin.qdoc
Change-Id: I5c0118a90111b51db04d2ea2eb6b3c47f1fb761f
Diffstat (limited to 'LICENSE.LGPLv21')
0 files changed, 0 insertions, 0 deletions