Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761 |
||
|---|---|---|
| .. | ||
| crashingServer | ||
| test | ||
| .gitignore | ||
| BLACKLIST | ||
| qtcpserver.pro | ||
| tst_qtcpserver.cpp | ||
Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761 |
||
|---|---|---|
| .. | ||
| crashingServer | ||
| test | ||
| .gitignore | ||
| BLACKLIST | ||
| qtcpserver.pro | ||
| tst_qtcpserver.cpp | ||