lp:~neon/kdepim-runtime/master
- Get this branch:
- bzr branch lp:~neon/kdepim-runtime/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kdepim-runtime.git.
Last successful import was .
Recent revisions
- 9937. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 9935. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 9934. By Daniel Vrátil <email address hidden>
-
SingleFileResource: port away from deprecated KGlobal::ref()
Makes libakonadi_
singlefileresou rce.so KDELibs4Support -free.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)