leinir updated this revision to Diff 69399. leinir added a comment.
- Merge branch 'master' into be-more-friendly-during-initial-load - Add a bit of @since REPOSITORY R304 KNewStuff CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D25173?vs=69383&id=69399 BRANCH be-more-friendly-during-initial-load (branched from master) REVISION DETAIL https://phabricator.kde.org/D25173 AFFECTED FILES src/qtquick/qml/DialogContent.qml src/qtquick/qml/Page.qml src/qtquick/quickengine.cpp src/qtquick/quickengine.h To: leinir, #knewstuff, #frameworks, ngraham, #vdg Cc: kde-frameworks-devel, LeGast00n, GB_2, michaelh, ngraham, bruns
