l10n daemon script
|
dc74ffa68c
|
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"
|
5 years ago |
l10n daemon script
|
7254c56886
|
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"
|
6 years ago |
l10n daemon script
|
90502b2961
|
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"
|
6 years ago |
l10n daemon script
|
1f50b2a6b4
|
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"
|
6 years ago |
l10n daemon script
|
2857dc241f
|
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"
|
6 years ago |
l10n daemon script
|
35e43602d4
|
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"
|
6 years ago |
l10n daemon script
|
ef53790eba
|
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"
|
6 years ago |
l10n daemon script
|
cc452498e5
|
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"
|
6 years ago |
l10n daemon script
|
4e9bbfddb0
|
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"
|
8 years ago |
l10n daemon script
|
003d46e926
|
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"
|
9 years ago |
Julian Wolff
|
4931385777
|
add markdown support
Summary:
Adds support for Markdown documents
BUG: 360603
Test Plan: Open a Markdown (.md) document in Okular
Reviewers: #okular, aacid
Reviewed By: #okular, aacid
Subscribers: michaelweghorn, aacid
Tags: #okular
Differential Revision: https://phabricator.kde.org/D7382
|
9 years ago |