l10n daemon script
0dc7e3fe53
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"
10 years ago
l10n daemon script
b6907427d0
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
dce5bc1bc0
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"
10 years ago
l10n daemon script
5e1a8c6b63
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
096b61ee44
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
aa0f2c88f0
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"
10 years ago
l10n daemon script
aff81afd27
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"
10 years ago
l10n daemon script
87ccc5010a
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
b2f053893e
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
7b23cbc13e
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"
10 years ago
Thomas Lübking
8885a6798a
emphasize minimization in m. all script
...
As long as there's something to minimize, do that.
Otherwise unminimize only the windows we minimized
on last invocation.
BUG: 356161
FIXED-IN: 5.6
REVIEW: 126225
10 years ago
l10n daemon script
f17e9c2e68
SVN_SILENT made messages (.desktop file)
10 years ago
l10n daemon script
f96f4a9fd1
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"
10 years ago
l10n daemon script
3433b05c97
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
42c594330a
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
c342be5961
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
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