diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
| commit | 1c8451bdbbd6ca909dfc5b96a24be909810522fc (patch) | |
| tree | 9cc69a4794e23f7224d75fc2323fc70e294a9454 /src/3rdparty/zlib | |
| parent | 7ebec0fa848de299d4cdee06ccc611ee46494fbf (diff) | |
| parent | 0635b1a69dd666f5eed4b096895bd80b1a9420ff (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/tools/qdoc/tree.cpp
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc
Diffstat (limited to 'src/3rdparty/zlib')
0 files changed, 0 insertions, 0 deletions