ngraham updated this revision to Diff 34715. ngraham added a comment.
Merge master to get those nice test fixes REPOSITORY R241 KIO CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D13048?vs=34675&id=34715 BRANCH iconNameForUrl (branched from master) REVISION DETAIL https://phabricator.kde.org/D13048 AFFECTED FILES src/core/global.cpp src/core/kfileitem.cpp src/ioslaves/trash/tests/testtrash.cpp To: ngraham, #frameworks, broulik Cc: apol, kde-frameworks-devel, michaelh, ngraham, bruns
