mart updated this revision to Diff 30914. mart added a comment.
- Merge branch 'master' into arcpatch-D11361 - add containmentsForActivity and containmentsForScreen REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D11361?vs=29622&id=30914 BRANCH arcpatch-D11361 REVISION DETAIL https://phabricator.kde.org/D11361 AFFECTED FILES src/plasma/corona.cpp src/plasma/corona.h src/plasma/private/corona_p.h To: mart, #plasma, davidedmundson Cc: davidedmundson, #frameworks, michaelh, ngraham
