← Back to branch summary

~elopio/ubuntu-filemanager-app/clean_context_menu_tests

~elopio/ubuntu-filemanager-app/clean_context_menu_tests

Viewing all changes in revision 184.

Committer: Tarmac
Author(s): carlos-mazieri
Date: 2014-05-17 12:57:46 UTC
mfrom: (168.5.5 pre5-repo)
Revision ID: tarmac-20140517125746-9kn0nwbz3w3w8v7f

it is the last part of https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/app-devel/+merge/216409 in fact the branches should be equals.

Approved by Carlos Jose Mazieri, Ubuntu Phone Apps Jenkins Bot.

files added:
src/plugin/folderlistmodel/trash/qtrashutilinfo.cpp

src/plugin/folderlistmodel/trash/qtrashutilinfo.h

src/plugin/folderlistmodel/trash/trashiteminfo.cpp

src/plugin/folderlistmodel/trash/trashiteminfo.h

src/plugin/folderlistmodel/trash/trashlocation.cpp

src/plugin/folderlistmodel/trash/trashlocation.h

files modified:
src/plugin/folderlistmodel/CMakeLists.txt

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/folderlistmodel.pri

src/plugin/folderlistmodel/iorequest.cpp

src/plugin/folderlistmodel/iorequest.h

src/plugin/folderlistmodel/locationsfactory.cpp

src/plugin/folderlistmodel/trash/qtrashdir.cpp

src/plugin/folderlistmodel/trash/qtrashdir.h

src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp

Show diffs side-by-side

added added

removed removed

src/plugin/folderlistmodel/CMakeLists.txt

src/plugin/folderlistmodel/dirmodel.cpp

src/plugin/folderlistmodel/dirmodel.h

src/plugin/folderlistmodel/folderlistmodel.pri

src/plugin/folderlistmodel/iorequest.cpp

src/plugin/folderlistmodel/iorequest.h

src/plugin/folderlistmodel/locationsfactory.cpp

src/plugin/folderlistmodel/trash/qtrashdir.cpp

src/plugin/folderlistmodel/trash/qtrashdir.h

src/plugin/folderlistmodel/trash/qtrashutilinfo.cpp

src/plugin/folderlistmodel/trash/qtrashutilinfo.h

src/plugin/folderlistmodel/trash/trashiteminfo.cpp

src/plugin/folderlistmodel/trash/trashiteminfo.h

src/plugin/folderlistmodel/trash/trashlocation.cpp

src/plugin/folderlistmodel/trash/trashlocation.h

src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp

Older »