Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404 |
||
|---|---|---|
| .. | ||
| dials | ||
| fingerpaint | ||
| knobs | ||
| pinchzoom | ||
| CMakeLists.txt | ||
| touch.pro | ||
Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404 |
||
|---|---|---|
| .. | ||
| dials | ||
| fingerpaint | ||
| knobs | ||
| pinchzoom | ||
| CMakeLists.txt | ||
| touch.pro | ||