Conflicts: .qmake.conf Change-Id: I936be3c0df2b9845ff6a85eb3d4442cdabe63d37 |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||
Conflicts: .qmake.conf Change-Id: I936be3c0df2b9845ff6a85eb3d4442cdabe63d37 |
||
|---|---|---|
| .. | ||
| access | ||
| bearer | ||
| kernel | ||
| socket | ||
| ssl | ||
| network.pro | ||