l10n daemon script
946406d114
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"
4 years ago
Heiko Becker
6bc195446d
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
1852cc8513
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"
4 years ago
l10n daemon script
b438b6bb0f
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
3d085787ea
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"
4 years ago
l10n daemon script
559c274f3a
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"
4 years ago
l10n daemon script
b910edafb6
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"
4 years ago
l10n daemon script
06612d93f0
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"
4 years ago
Heiko Becker
6ad408cd66
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
c823af787b
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"
4 years ago
Heiko Becker
3144226af6
GIT_SILENT Update Appstream for new release
4 years ago
Heiko Becker
172f4edeae
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
dbcda67ab9
Fix opening CHM files on Windows
...
This is part of 451985 the other part is that KF5.91 windows build of
khtml was broken, seems the 5.92 one is good, so once we release 22.04.0
it should be all good hopefully.
BUGS: 451985
4 years ago
Volker Krause
50d0703ae0
Enable readability-braces-around-statements
4 years ago
Heiko Becker
fe5847155c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b2d872c79f )
4 years ago
l10n daemon script
9cdc390f53
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"
4 years ago
l10n daemon script
5115d6db24
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"
4 years ago
Heiko Becker
db9dd90925
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 715fd1ac36 )
4 years ago
Heiko Becker
715fd1ac36
GIT_SILENT Update Appstream for new release
4 years ago
Heiko Becker
11448b94b1
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8a09492a9a )
4 years ago
Heiko Becker
8a09492a9a
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
84d977dd2d
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
09a2b506ed
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 84d977dd2d )
4 years ago
l10n daemon script
a520e4378b
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"
4 years ago
Heiko Becker
b5eebfa12d
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2a00f650c5 )
4 years ago
Heiko Becker
458c72a9c3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4304bcc397 )
5 years ago
Heiko Becker
4304bcc397
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
84c9f3ea2a
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
e6c6e52253
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
9a4f79ff83
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
7c87c702df
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
7ae4288f35
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
f023cdc5b7
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
cc5849a6f8
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
21f96680a6
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
b022f98495
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
6faaf727f6
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
Albert Astals Cid
0c659a5466
clang-tidy: Enable google-explicit-constructor
5 years ago
l10n daemon script
a225fb6d9a
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
Heiko Becker
5c16b25a11
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
9672d09900
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5c16b25a11 )
5 years ago
l10n daemon script
3dbe3b18f5
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
361d084c44
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
7c2bac7d27
GIT_SILENT made messages (after extraction)
5 years ago
Heiko Becker
139b822b0f
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit bf0642bfcb )
5 years ago
Heiko Becker
bf0642bfcb
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
14f9f06f44
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
21bc8bd023
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
5447aa1021
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
16da5cb4b4
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