diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 15:06:22 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 16:35:42 +0200 |
| commit | b2603b76655ac819e43c063bb6f16bc95f358083 (patch) | |
| tree | 0fbe2c367ebfffdb70e9e3f21a7cf408bafd9626 /doc/global/template/style/theqtcompany.png | |
| parent | 99b94aadf875c822afb6c2580e43355ac392ac92 (diff) | |
| parent | 756266d01560157b7274e466b9ffc1b0e2ef9a1f (diff) | |
Merge remote-tracking branch 'origin/5.5' into HEAD
Conflicts:
src/plugins/platforms/windows/qwindowsopengltester.cpp
Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe
Diffstat (limited to 'doc/global/template/style/theqtcompany.png')
| -rw-r--r-- | doc/global/template/style/theqtcompany.png | bin | 11748 -> 31759 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/global/template/style/theqtcompany.png b/doc/global/template/style/theqtcompany.png Binary files differindex b9799f387c..fee3d26f3d 100644 --- a/doc/global/template/style/theqtcompany.png +++ b/doc/global/template/style/theqtcompany.png |
