Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6 |
||
|---|---|---|
| .. | ||
| doc | ||
| dombookmarks.pro | ||
| jennifer.xbel | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| xbeltree.cpp | ||
| xbeltree.h | ||
Conflicts: src/corelib/io/qwindowspipewriter.cpp src/widgets/styles/qcommonstyle.cpp Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6 |
||
|---|---|---|
| .. | ||
| doc | ||
| dombookmarks.pro | ||
| jennifer.xbel | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| xbeltree.cpp | ||
| xbeltree.h | ||