Merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 into lp:ubuntu-filemanager-app
Status: | Merged |
---|---|
Approved by: | Carlos Jose Mazieri |
Approved revision: | 514 |
Merged at revision: | 515 |
Proposed branch: | lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 |
Merge into: | lp:ubuntu-filemanager-app |
Prerequisite: | lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-01 |
Diff against target: |
371 lines (+154/-58) 9 files modified
src/plugin/folderlistmodel/disk/disklocation.cpp (+3/-1) src/plugin/folderlistmodel/disk/disklocation.h (+2/-1) src/plugin/folderlistmodel/location.h (+3/-1) src/plugin/folderlistmodel/locationitemdiriterator.cpp (+53/-13) src/plugin/folderlistmodel/locationitemdiriterator.h (+41/-8) src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.cpp (+28/-24) src/plugin/folderlistmodel/smb/qsambaclient/src/smblocationdiriterator.h (+19/-7) src/plugin/folderlistmodel/smb/smblocation.cpp (+3/-2) src/plugin/folderlistmodel/smb/smblocation.h (+2/-1) |
To merge this branch: | bzr merge lp:~carlos-mazieri/ubuntu-filemanager-app/new-protocols-support-02 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jenkins Bot | continuous-integration | Approve | |
Arto Jalkanen | Approve | ||
Review via email: mp+280388@code.launchpad.net |
Commit message
LocationItemDir
LocationItemDir
For Disk loading, that means in DiskLocationIte
Description of the change
LocationItemDir
LocationItemDir
For Disk loading, that means in DiskLocationIte
PASSED: Continuous integration, rev:513 /core-apps- jenkins. ubuntu. com/job/ filemanager- app-ci/ 38/ /core-apps- jenkins. ubuntu. com/job/ generic- update- mp/252/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /core-apps- jenkins. ubuntu. com/job/ filemanager- app-ci/ 38/rebuild
https:/