Conflicts: src/corelib/tools/qstring.cpp Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| double_data.h | ||
| qstring.pro | ||
| tst_qstring.cpp | ||
Conflicts: src/corelib/tools/qstring.cpp Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| double_data.h | ||
| qstring.pro | ||
| tst_qstring.cpp | ||