leinir updated this revision to Diff 70427. leinir added a comment.
(just a little merge, for my own sanity... but also ping?) - Merge branch 'master' into send-config-name-with-requests REPOSITORY R304 KNewStuff CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D25441?vs=70111&id=70427 BRANCH send-config-name-with-requests (branched from master) REVISION DETAIL https://phabricator.kde.org/D25441 AFFECTED FILES src/attica/atticaprovider.cpp src/attica/atticaprovider_p.h src/core/engine.cpp To: leinir, #knewstuff, #frameworks, #plasma, starbuck, ronaldv Cc: kde-frameworks-devel, LeGast00n, GB_2, michaelh, ngraham, bruns
