diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-08-12 12:34:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-12 14:43:59 +0200 |
| commit | 0af61d773fc7263573afc6b7a973451783bf7424 (patch) | |
| tree | 327563220f4fe53649b7fc98f982b659b462a9dc /src/quick/scenegraph/qsgcontext_p.h | |
| parent | 4ad1b63f257ac033e3876130f39eba3325363de5 (diff) | |
| parent | 61f72d32b4fddc6e87f21d0243d9f0a32ca61987 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/quick/scenegraph/qsgcontext_p.h')
0 files changed, 0 insertions, 0 deletions