← Back to branch summary

~vcs-imports/amarok/master

~vcs-imports/amarok/master

Viewing all changes in revision 28343.

Committer: Rick W. Chen
Date: 2010-09-21 23:26:09 UTC
mfrom: (28317.1.3)
Revision ID: git-v1:ef7f773558149d4f5ebef6170532ebdb5bef9e22

Merge branch 'trash-location'

files added:
src/core-impl/collections/support/TrashCollectionLocation.cpp

src/core-impl/collections/support/TrashCollectionLocation.h

files modified:
ChangeLog

src/CMakeLists.txt

src/browsers/CollectionTreeView.cpp

src/browsers/CollectionTreeView.h

src/browsers/filebrowser/FileView.cpp

src/browsers/filebrowser/FileView.h

src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp

src/core-impl/collections/support/CollectionLocationDelegateImpl.cpp

src/core-impl/collections/support/CollectionLocationDelegateImpl.h

src/core/collections/CollectionLocation.cpp

src/core/collections/CollectionLocationDelegate.h

tests/core/collections/MockCollectionLocationDelegate.h

Show diffs side-by-side

added added

removed removed

src/CMakeLists.txt

src/browsers/CollectionTreeView.cpp

src/browsers/CollectionTreeView.h

src/browsers/filebrowser/FileView.cpp

src/browsers/filebrowser/FileView.h

src/core-impl/collections/sqlcollection/SqlCollectionLocation.cpp

src/core-impl/collections/support/CollectionLocationDelegateImpl.cpp

src/core-impl/collections/support/CollectionLocationDelegateImpl.h

src/core-impl/collections/support/TrashCollectionLocation.cpp

src/core-impl/collections/support/TrashCollectionLocation.h

src/core/collections/CollectionLocation.cpp

src/core/collections/CollectionLocationDelegate.h

tests/core/collections/MockCollectionLocationDelegate.h

Older »