diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-31 16:08:59 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-31 16:08:59 +0100 |
| commit | f7fd7460231ea9ad80fc85b4af793ad7ace56930 (patch) | |
| tree | 2155c9399945b4ebe0b9af84da75b478afb30683 /LICENSE.FDL | |
| parent | f4b2f9eeac7f9175a5834f405ad88fb6d28864e1 (diff) | |
| parent | 10972ca272ae59fbe0f18eef6d9237fbd4aaca86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickpopup.cpp
src/quicktemplates2/qquickpopup_p_p.h
Change-Id: I33241dfd15a320e6ae2f0c056252b0ec6be7c6f6
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions