Thomas Lübking
|
121d59ee28
|
add black/whitelist config to videowall
REVIEW: 125410
BUG: 353153
FIXED-IN: 5.5
|
11 years ago |
l10n daemon script
|
e148fc5bc9
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
3c96b23c17
|
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"
|
11 years ago |
|
l10n daemon script
|
c8ec8ceae2
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
726b1addd2
|
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"
|
11 years ago |
|
l10n daemon script
|
9af31e8024
|
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"
|
11 years ago |
|
l10n daemon script
|
b5b8dee854
|
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"
|
11 years ago |
|
l10n daemon script
|
4b8fabca40
|
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"
|
11 years ago |
|
l10n daemon script
|
d07fd3a140
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
99237c9b3f
|
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"
|
11 years ago |
|
l10n daemon script
|
d0e5e86a30
|
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"
|
11 years ago |
|
l10n daemon script
|
7724edac14
|
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"
|
11 years ago |
|
l10n daemon script
|
dd86680b72
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
b4c8fa64b8
|
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"
|
11 years ago |
|
l10n daemon script
|
88a15d10ae
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
dc19c0ed02
|
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"
|
11 years ago |
|
l10n daemon script
|
3b93e2e826
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
f4e2e0e2e9
|
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"
|
11 years ago |
|
l10n daemon script
|
5aeedeb8e9
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
7c747e1591
|
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"
|
11 years ago |
|
l10n daemon script
|
e8a070ac30
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
7037327ec4
|
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"
|
11 years ago |
|
l10n daemon script
|
49586fdd00
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
e9afce7b04
|
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"
|
11 years ago |
|
l10n daemon script
|
0a6668c53b
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
5cd7658930
|
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"
|
11 years ago |
|
l10n daemon script
|
d18b931f55
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
ef748afe63
|
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"
|
11 years ago |
|
l10n daemon script
|
5a093d134c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
53392ea009
|
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"
|
11 years ago |
|
l10n daemon script
|
8b1f42314c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
1a1a6cd8bf
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
cb08f61786
|
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"
|
11 years ago |
|
l10n daemon script
|
c05e355003
|
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"
|
11 years ago |
|
l10n daemon script
|
c8de289e6f
|
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"
|
11 years ago |
Yuri Chornoivan
|
4e140399c7
|
Fix typo
|
11 years ago |
|
Thomas Lübking
|
0e22088bf4
|
add "MinimizeAll" script
to compensate withdrawn core feature (which
though has been hidden so far)
|
11 years ago |
|
l10n daemon script
|
64841a2434
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
01b61a9ede
|
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"
|
11 years ago |
|
l10n daemon script
|
9361fb8610
|
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"
|
11 years ago |
|
l10n daemon script
|
777dc69831
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
a59a89d36c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
a14e62dadc
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
795ebbb879
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
e178851846
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
bf7bf73464
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
d173ff7412
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
8629054181
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
ccc7e52dc9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
a010bbc6a7
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
