Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| qlockfiletesthelper | ||
| qlockfile.pro | ||
| tst_qlockfile.cpp | ||
| tst_qlockfile.pro | ||
Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| qlockfiletesthelper | ||
| qlockfile.pro | ||
| tst_qlockfile.cpp | ||
| tst_qlockfile.pro | ||