Volker Krause
|
002848efa8
|
Adapt build system to also support Qt 6
This is complicated by the Qt 5.6 requirement of SailfishOS, hopefully
that didn't get broken by this.
|
2022-10-29 16:51:41 +02:00 |
|
Aleix Pol
|
c989be56cd
|
virtualmonitor: Make sure we clean up m_process after deleting
|
2022-10-17 00:33:33 +02:00 |
|
l10n daemon script
|
f556dc721b
|
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"
|
2022-09-30 01:47:48 +00:00 |
|
l10n daemon script
|
03a58c66a5
|
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"
|
2022-09-20 01:48:04 +00:00 |
|
Nicolas Fella
|
a918ffc0cb
|
Add and make use of ECM's clang-format integration
|
2022-09-11 23:21:58 +00:00 |
|
l10n daemon script
|
34da0ad9e1
|
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"
|
2022-09-05 01:43:43 +00:00 |
|
l10n daemon script
|
b25f7e07a8
|
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"
|
2022-08-27 01:49:35 +00:00 |
|
l10n daemon script
|
8752e67f83
|
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"
|
2022-08-26 01:44:16 +00:00 |
|
l10n daemon script
|
b525d660bc
|
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"
|
2022-08-25 01:46:23 +00:00 |
|
l10n daemon script
|
7f0b03f254
|
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"
|
2022-08-11 01:42:55 +00:00 |
|
l10n daemon script
|
cdc5f1eba2
|
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"
|
2022-07-31 01:46:42 +00:00 |
|
l10n daemon script
|
653a8e34a3
|
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"
|
2022-07-24 01:43:58 +00:00 |
|
l10n daemon script
|
623c74f81f
|
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"
|
2022-07-23 01:45:01 +00:00 |
|
l10n daemon script
|
68cdecff16
|
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"
|
2022-07-20 01:42:56 +00:00 |
|
l10n daemon script
|
182fd5f279
|
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"
|
2022-07-15 01:46:22 +00:00 |
|
l10n daemon script
|
280c0fb27f
|
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"
|
2022-07-14 01:49:45 +00:00 |
|
l10n daemon script
|
87b41a96a9
|
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"
|
2022-07-10 01:49:18 +00:00 |
|
l10n daemon script
|
b100d75077
|
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"
|
2022-07-09 01:46:21 +00:00 |
|
l10n daemon script
|
58cc209582
|
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"
|
2022-07-03 01:55:31 +00:00 |
|
l10n daemon script
|
3f42e61b1d
|
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"
|
2022-07-02 02:00:21 +00:00 |
|
l10n daemon script
|
d497860cd3
|
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"
|
2022-06-23 01:42:11 +00:00 |
|
l10n daemon script
|
12180f8d99
|
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"
|
2022-06-20 01:51:58 +00:00 |
|
l10n daemon script
|
889beb8a53
|
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"
|
2022-06-13 02:25:53 +00:00 |
|
l10n daemon script
|
96583a62c2
|
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"
|
2022-06-05 01:42:52 +00:00 |
|
l10n daemon script
|
9b26dadd5c
|
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"
|
2022-06-04 01:42:32 +00:00 |
|
l10n daemon script
|
0f3d60b678
|
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"
|
2022-06-02 01:42:04 +00:00 |
|
l10n daemon script
|
af2d51349a
|
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"
|
2022-06-01 01:55:05 +00:00 |
|
l10n daemon script
|
edbea8c3fd
|
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"
|
2022-05-29 01:44:05 +00:00 |
|
l10n daemon script
|
7f3181a86e
|
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"
|
2022-05-28 02:13:15 +00:00 |
|
l10n daemon script
|
baded216a5
|
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"
|
2022-05-27 01:42:01 +00:00 |
|
l10n daemon script
|
748ae772d4
|
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"
|
2022-05-26 01:43:07 +00:00 |
|
l10n daemon script
|
d6251f726e
|
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"
|
2022-05-25 01:45:00 +00:00 |
|
Aleix Pol
|
084bfebcc8
|
Introduce the VirtualMonitor plugin
It allows to use other paired devices as external displays
transparently.
|
2022-05-25 00:04:47 +02:00 |
|