lp:~neon/kdesdk-thumbnailers/master
- Get this branch:
- bzr branch lp:~neon/kdesdk-thumbnailers/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at https://invent.kde.org/sdk/kdesdk-thumbnailers.
Last successful import was 1 hour ago.
Recent revisions
- 55. By l10n daemon script <email address hidden> on 2020-09-24
-
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" - 54. By l10n daemon script <email address hidden> on 2020-08-12
-
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" - 53. By l10n daemon script <email address hidden> on 2020-07-17
-
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" - 52. By l10n daemon script <email address hidden> on 2020-06-18
-
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" - 51. By l10n daemon script <email address hidden> on 2020-06-17
-
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" - 50. By Laurent Montel <email address hidden> on 2019-11-06
-
GIT_SILENT: Increase cmake minimum version
- 48. By Laurent Montel <email address hidden> on 2019-11-06
-
It compiles fine without deprecated method
- 46. By l10n daemon script <email address hidden> on 2019-08-07
-
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"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)