Conflicts: src/corelib/tools/qalgorithms.h Change-Id: Ib8ce4d5d9ecd5b9c166d5b8b44e58f3e4e7283ff |
||
|---|---|---|
| .. | ||
| doc | ||
| jennifer.xbel | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| saxbookmarks.pro | ||
| xbelgenerator.cpp | ||
| xbelgenerator.h | ||
| xbelhandler.cpp | ||
| xbelhandler.h | ||
Conflicts: src/corelib/tools/qalgorithms.h Change-Id: Ib8ce4d5d9ecd5b9c166d5b8b44e58f3e4e7283ff |
||
|---|---|---|
| .. | ||
| doc | ||
| jennifer.xbel | ||
| main.cpp | ||
| mainwindow.cpp | ||
| mainwindow.h | ||
| saxbookmarks.pro | ||
| xbelgenerator.cpp | ||
| xbelgenerator.h | ||
| xbelhandler.cpp | ||
| xbelhandler.h | ||