diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:39:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-11-10 11:39:35 +0100 |
| commit | d7a5dc0cfdae2fb22b7061301575f04f2bcc3f1c (patch) | |
| tree | 984a2638088671d2191fbd31e7076c756ab7dfb5 /qmake/generators/unix/unixmake2.cpp | |
| parent | 3d70925ee54d06e90bea392883d230b8ae2b1782 (diff) | |
| parent | 73a1e8c60d894701f34806cc4b847aa2814bf389 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4.0
Conflicts:
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Iad9ef6bf7d6111efba8232a7d9b46bb9974912f5
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
0 files changed, 0 insertions, 0 deletions