Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qtimer.pro | ||
| tst_qtimer.cpp | ||
Conflicts: src/plugins/platforms/windows/qwindowsopengltester.cpp Change-Id: Ia7abeba9395ccf84e2fa81b91a5725a86dedb9fe |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| qtimer.pro | ||
| tst_qtimer.cpp | ||