l10n daemon script
|
44c85c7f65
|
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"
|
7 years ago |
l10n daemon script
|
2887d87ed5
|
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"
|
7 years ago |
l10n daemon script
|
fbf7f956ff
|
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"
|
7 years ago |
l10n daemon script
|
fb19df1aa2
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
8e57d0895c
|
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"
|
7 years ago |
l10n daemon script
|
01f3c3d376
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
bde26dc861
|
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"
|
7 years ago |
l10n daemon script
|
bdbd2127d6
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
bd99b40485
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
c3dce2aa80
|
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"
|
7 years ago |
l10n daemon script
|
9f393fe1ae
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
c32b899ae3
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
2860504d6b
|
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"
|
7 years ago |
l10n daemon script
|
9eb11111aa
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
Christoph Cullmann
|
5bb7e9cfcf
|
Add --wmclass argument to linux completion files
Reviewers: #falkon, drosca
Reviewed By: #falkon, drosca
Subscribers: cullmann, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D18667
|
7 years ago |
l10n daemon script
|
524697d139
|
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"
|
7 years ago |
l10n daemon script
|
caf1380774
|
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"
|
7 years ago |
l10n daemon script
|
8d321a72bf
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
0684603930
|
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"
|
7 years ago |
l10n daemon script
|
8f6054f788
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
5b831a3c8c
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
116ba93b79
|
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"
|
7 years ago |
l10n daemon script
|
5fb500465f
|
GIT_SILENT made messages (after extraction)
|
7 years ago |
l10n daemon script
|
b44134fd07
|
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
|
82417ff4a5
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
e0d1175dd1
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
1500f2202a
|
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
|
0a744919e5
|
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
|
5ca5bc7384
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
06020d9615
|
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
|
1c6f5bd8e2
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
286f329109
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
086d572e25
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
90d5c5b3d6
|
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
|
8651321936
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
0e96dd33c2
|
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
|
73123c72c2
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
62839a6d4e
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
c252de4bdd
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
277003fa1d
|
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
|
aca4f6c0a9
|
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 |
David Rosca
|
3760a9ffd1
|
AppImage: Bundle KWindowSystem plugins
|
8 years ago |
David Rosca
|
68ff092b4c
|
Update AppImage build Dockerfile
|
8 years ago |
David Rosca
|
dd8d8b9007
|
Add Dockerfile for building AppImage
|
8 years ago |
l10n daemon script
|
19e2c4ed76
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
e36d092c08
|
GIT_SILENT made messages (after extraction)
|
8 years ago |
l10n daemon script
|
dd60458d6a
|
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
|
5043a7675d
|
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
|
75d5f5d552
|
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
|
08a3fe5476
|
GIT_SILENT made messages (after extraction)
|
8 years ago |