Martin T. H. Sandsmark
7f3eebd9f3
Only show warning messages by default
...
REVIEW: 129832
9 years ago
l10n daemon script
e44b17080a
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
l10n daemon script
93b824de9e
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4290dffb1b
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
30993aa3f1
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fb77e0d1fd
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
l10n daemon script
006cb782a2
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
20f6524016
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
b6614c4da4
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
l10n daemon script
6bc9feaba4
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4952893372
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
l10n daemon script
e798a92c06
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
4ed39dfc16
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
l10n daemon script
8c2120e2d3
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
0d6f6edf60
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
l10n daemon script
31da71cdec
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
5282d434ee
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
l10n daemon script
56759cd0b3
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
dcb3edcf30
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
l10n daemon script
4c8280e461
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fa74d6eea7
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
297795d40d
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
l10n daemon script
e65f2c6f62
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
l10n daemon script
fecf0a8de6
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
fe628b9dbf
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
l10n daemon script
96fd8111c1
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
5527fe1d44
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
l10n daemon script
43cde01ced
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
3fe1bef3d6
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
l10n daemon script
f505e51b32
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
da42e4b166
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
l10n daemon script
5ddc51b6c3
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
l10n daemon script
6aaf19e884
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
5a7f11927f
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
l10n daemon script
d075df4eb0
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
7cb74091e3
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
l10n daemon script
a1fbd54673
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
l10n daemon script
151a8f7e78
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
l10n daemon script
5a4b3f4aa9
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
1c3e55c4f2
SVN_SILENT made messages (after extraction)
9 years ago
Miklós Máté
4520ac7192
Fix comparision between signed and unsigned
...
REVIEW: 129285
Note by Albert, this is still "broken" since QImage works on ints and the ft slot on uints so technically we should be doing lots of checks when calling scanLine and stuff, but compilers don't complain about that, so let's pretend all is good
9 years ago
l10n daemon script
66cba6e293
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
l10n daemon script
3f484b44a9
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
l10n daemon script
92efe12446
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
a673dca880
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
l10n daemon script
dcb51a7f26
SVN_SILENT made messages (after extraction)
9 years ago
l10n daemon script
b1bb8bfc61
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
466a6ae8c2
SVN_SILENT made messages (after extraction)
10 years ago
Friedrich W. H. Kossebau
37aafeba93
Remove no longer existing include dir
...
--warnings
10 years ago
l10n daemon script
3a16c16a17
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