Heiko Becker
7c2c9a1231
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit bcaeb7566a )
3 years ago
Willyanto Willyanto
647cdc40d0
Perform some initializations in initialization list
...
Fixes some variable is assigned in constructor body. Consider performing
initialization in initialization list. (CWE-398)
3 years ago
l10n daemon script
e7f7f7d7af
GIT_SILENT made messages (after extraction)
3 years ago
Heiko Becker
c400b675b6
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5138c6ceae )
3 years ago
l10n daemon script
9ef28fffec
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"
3 years ago
l10n daemon script
e91c6cf0cf
GIT_SILENT made messages (after extraction)
3 years ago
l10n daemon script
bf745445bf
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"
3 years ago
Cimbali
a33e499b40
Fix wrong interpretation of autoplay flag
...
BUGS: 436709
3 years ago
Albert Astals Cid
f1f638c2c5
Compile with discount 3
3 years ago
Heiko Becker
c3c0d8d528
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit cffa20eeae )
3 years ago
Willyanto Willyanto
98876cf588
Replace qSwap with std::swap
...
Fixes obsolete function 'qSwap' called. It is recommended to use 'std::swap'
instead. (CWE-477)
3 years ago
Albert Astals Cid
3165771409
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 54faf31823 )
3 years ago
l10n daemon script
a9c435bce6
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"
3 years ago
Heiko Becker
95846eaf4e
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 6076431f4b )
3 years ago
Heiko Becker
7a27483063
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit cf4777477c )
3 years ago
l10n daemon script
dcc6cd77f2
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"
3 years ago
Albert Astals Cid
fc8059575e
Two more version checks that are not needed now
3 years ago
Albert Astals Cid
91afa74342
Set minimum requirement to Ubuntu 22.04
3 years ago
l10n daemon script
b44ac3af51
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"
3 years ago
l10n daemon script
3c4d8cbfd3
GIT_SILENT made messages (after extraction)
3 years ago
l10n daemon script
9f1300c115
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"
3 years ago
Ilya Pominov
a51de260f5
Fix build warning in pdf generator
...
warning: ‘void Poppler::Document::getPdfVersion(int*, int*) const’ is
deprecated [-Wdeprecated-declarations]
3 years ago
l10n daemon script
a8a89b2d8c
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"
3 years ago
l10n daemon script
547a0e2f76
GIT_SILENT made messages (after extraction)
3 years ago
l10n daemon script
9579a4540f
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"
3 years ago
l10n daemon script
235c93c8ad
GIT_SILENT made messages (after extraction)
3 years ago
Heiko Becker
8119d903a3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b39a4d7fe2 )
3 years ago
l10n daemon script
804cadfb53
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
5fcb59011b
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
04059bae4b
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
db9f77543e
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8cb15507fd )
4 years ago
Heiko Becker
8cb15507fd
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
656587ca63
epub: Improve TableOfContents for some files
...
The link can be percent encoded so try it like that if not found in the
normal way, also if the text overflows the page, it's in the next page
BUGS: 458289
4 years ago
Albert Astals Cid
4ad5753c3c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit a0c6cb572a )
4 years ago
Albert Astals Cid
a0c6cb572a
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
0330558977
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
f0d3e6f047
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
Nicolas Fella
899575ce83
Remove unused include
4 years ago
l10n daemon script
7589278d35
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
Albert Astals Cid
0a571b84df
clang-tidy-14
4 years ago
l10n daemon script
7094ed0586
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
326d314677
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
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
l10n daemon script
566687744e
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
07b9872518
GIT_SILENT made messages (after extraction)
4 years ago
Heiko Becker
f9e78b9253
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 6bc195446d )
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
9df4986183
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