l10n daemon script
cc452498e5
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"
6 years ago
Christoph Feck
884b082aea
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
3d148bd570
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
903cdec02b
GIT_SILENT fix version
...
need to figure out a way to make this work :/
6 years ago
Christoph Feck
c8dcf1fdea
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
a7876ca013
GIT_SILENT Update Appstream for new release
6 years ago
Albert Astals Cid
9a32bd354d
Enable clazy raw-environment-function
6 years ago
Albert Astals Cid
5ecbb51f77
Enable modernize-use-nullptr
6 years ago
l10n daemon script
a26dd5118a
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"
6 years ago
l10n daemon script
0d5bd0bc43
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"
6 years ago
Christoph Feck
a18c013932
GIT_SILENT Update Appstream for new release
6 years ago
l10n daemon script
79de5d3958
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"
6 years ago
l10n daemon script
a5eda6348f
GIT_SILENT made messages (after extraction)
6 years ago
Christoph Feck
475652a990
Update Appstream for new release
6 years ago
Albert Astals Cid
0a2287be19
CI: Enable two readability clang-tidy checks
...
Use jq to filter compile_commands.json to not include the compilation of
autogenerated files, we don't want to check those
Also filter out the synctex folder, since that is imported code
6 years ago
Albert Astals Cid
78cf6bd910
CI: enable more modernize checks
...
Since unfortunately some of the autogenerated includes don't pass the
checks we do a trick of building out of source and then specifying the
.*/okular/.* path as the only includes we care about
6 years ago
Albert Astals Cid
a2ac42b9c7
CI: Enable modernize-use-bool-literals
6 years ago
Albert Astals Cid
f7f2b3105f
Increase version here too
6 years ago
Christoph Feck
7974aa1d36
Update Appstream for new release
6 years ago
Laurent Montel
8beef33c05
Port some deprecated methods
7 years ago
l10n daemon script
b16dcf41aa
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
bf7a53d62b
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
a7742d4604
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
aaa176041d
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
5e01eff352
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
241bc6525a
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
Albert Astals Cid
47d7d04b5e
delete copy constructor and assignment operator of some internal classes
...
they are unused(except the PageViewItem one), but if anyone would use
them things would go wrong, so protect us from it
Actually fixes a bug in PageView::slotFitWindowToPage in which we were
copying constructing PageViewItem and that's bad
7 years ago
l10n daemon script
33a5f67eb2
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
4e9bbfddb0
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
96f4f27ba6
GIT_SILENT made messages (after extraction)
8 years ago
Yuri Chornoivan
c04ca1fa96
Fix minor EBN issues
8 years ago
l10n daemon script
d85fe1df64
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
bae0e13719
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
f1d3c68115
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
5f93a0b90e
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
c4570f7e40
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
2e73a6d76f
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
879a46ac55
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
b7c733f459
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
ee57925c57
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
26c40ab7bd
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
9c6494b353
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
29b1dec92b
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
066805c550
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
22885c00b0
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
02a4cfb26a
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
0ef249b5a5
GIT_SILENT made messages (after extraction)
8 years ago
l10n daemon script
1883a06614
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
76a4ad6323
GIT_SILENT made messages (after extraction)
9 years ago
l10n daemon script
72abe6f85a
GIT_SILENT made messages (after extraction)
9 years ago