diff options
| author | Simon Hausmann <[email protected]> | 2014-09-08 13:10:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2014-09-08 13:10:21 +0200 |
| commit | 38fe461e2cc4bf3aebcb98d25c643bfe6653120a (patch) | |
| tree | b625415f33791ce0202538396509379fd04b111a /src/quick/scenegraph/util/qsgtextureprovider.h | |
| parent | f9ee33f9683a4cd4d1a2e41efa6e8d124e9d731d (diff) | |
| parent | f7c3035fa1d965dceb36892122683a5ceb6cab89 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
src/qml/jsruntime/qv4arraydata.cpp
src/quick/scenegraph/util/qsgatlastexture.cpp
Change-Id: Ic4c96066d5c37dcf0d5446baed590ea005d445ce
Diffstat (limited to 'src/quick/scenegraph/util/qsgtextureprovider.h')
0 files changed, 0 insertions, 0 deletions