b2603b7665
Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe |
||
---|---|---|
.. | ||
qglobalstatic.pro | ||
tst_qglobalstatic.cpp |
b2603b7665
Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe |
||
---|---|---|
.. | ||
qglobalstatic.pro | ||
tst_qglobalstatic.cpp |