Revision 87ea4c0...
Go back to digest for 14th October 2012Features in KDE Base
Vishesh Handa committed changes in [nepomuk-core] /storage:
Merge branch 'feature/backup'
Merge the new backup system into master. The new backup is not complete
and still requires polishing and some other work, but it is in a lot
better condition that the one in master. Hence the master.
Additionally, this moves around certain code shared with the storage
service a lot, and that makes merges harder.
Conflicts:
services/storage/syncresourceidentifier.h
services/storage/syncresourceidentifier.cpp
File Changes
Modified 6 files
- /storage
- services/datamanagementmodel.cpp
- services/resourcemerger.h
- services/syncresource.cpp
- services/syncresource.h
- services/syncresourceidentifier.cpp
- services/syncresourceidentifier.h
6 files changed in total