1
0
mirror of https://invent.kde.org/network/krfb synced 2024-07-05 09:28:35 +00:00
Commit Graph

1382 Commits

Author SHA1 Message Date
l10n daemon script
5e18689b8e GIT_SILENT made messages (after extraction) 2021-05-10 00:20:04 +00:00
Heiko Becker
68866dc4fa GIT_SILENT Update Appstream for new release
(cherry picked from commit 4a36c727c2)
2021-05-07 20:36:21 +02:00
l10n daemon script
15f5654e5b 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"
2021-04-25 01:20:50 +00:00
l10n daemon script
76e36c0761 GIT_SILENT made messages (after extraction) 2021-04-25 00:18:35 +00:00
Heiko Becker
0afcfc82b9 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5959b4690d)
2021-04-14 17:25:03 +02:00
Albert Astals Cid
730e4d74a8 GIT_SILENT Upgrade release service version to 21.07.70. 2021-03-13 22:21:04 +01:00
l10n daemon script
d533b76f9b 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"
2021-03-13 06:42:19 +01:00
l10n daemon script
34a0e0c361 GIT_SILENT made messages (after extraction) 2021-03-13 02:36:42 +01:00
Albert Astals Cid
e1fdba3014 Merge remote-tracking branch 'origin/release/20.12' 2021-03-13 00:56:36 +01:00
Heiko Becker
73500f837e GIT_SILENT Update Appstream for new release
(cherry picked from commit f9a062ffa9)
2021-02-25 00:41:46 +01:00
Heiko Becker
f9a062ffa9 GIT_SILENT Update Appstream for new release 2021-02-25 00:29:46 +01:00
Heiko Becker
a4177eac39 GIT_SILENT Upgrade release service version to 20.12.3. 2021-02-25 00:05:58 +01:00
Laurent Montel
15068b250c We depend against kf5.68 => depend against qt 5.12 2021-02-08 07:06:20 +01:00
Laurent Montel
326d58a439 GIT_SILENT: don't use deprecated cmake variable 2021-02-08 07:05:59 +01:00
Heiko Becker
1a7f3a8517 GIT_SILENT Update Appstream for new release 2021-01-29 21:24:50 +01:00
Heiko Becker
3625b0cee3 GIT_SILENT Update Appstream for new release
(cherry picked from commit 1a7f3a8517)
2021-01-29 21:24:50 +01:00
Heiko Becker
7ef0dce382 GIT_SILENT Upgrade release service version to 20.12.2. 2021-01-29 20:48:53 +01:00
l10n daemon script
72270006ca 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"
2021-01-24 11:14:42 +01:00
l10n daemon script
938f98cef5 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"
2021-01-24 06:57:01 +01:00
Aleix Pol
93eb2d78d4 Merge branch 'release/20.12' 2021-01-22 02:00:03 +01:00
Aleix Pol
f041cdf095 pipewire: Support BGRA
It's not supported by QImage, so we need to do it ourselves by swapping
the B and the R.
2021-01-22 00:58:34 +00:00
l10n daemon script
e1e359fa7b 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"
2021-01-18 11:54:54 +01:00
l10n daemon script
50b72f26a8 GIT_SILENT made messages (after extraction) 2021-01-18 09:20:26 +01:00
l10n daemon script
2c184a22bf 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"
2021-01-18 07:08:20 +01:00
l10n daemon script
bb35068a1d GIT_SILENT made messages (after extraction) 2021-01-18 02:43:31 +01:00
Christoph Feck
706d4853b2 GIT_SILENT Update Appstream for new release 2021-01-02 15:22:45 +01:00
Christoph Feck
f03b829814 GIT_SILENT Update Appstream for new release
(cherry picked from commit 706d4853b2)
2021-01-02 15:22:45 +01:00
Christoph Feck
4335f83dab GIT_SILENT Upgrade release service version to 20.12.1. 2021-01-02 14:23:25 +01:00
l10n daemon script
08d967af66 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"
2020-12-18 10:01:32 +01:00
l10n daemon script
f0c1bc787e GIT_SILENT made messages (after extraction) 2020-12-18 08:30:35 +01:00
l10n daemon script
230040c5a9 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"
2020-12-07 09:53:53 +01:00
l10n daemon script
dad7f0184b GIT_SILENT made messages (after extraction) 2020-12-07 08:20:11 +01:00
l10n daemon script
74070d3baa 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"
2020-12-07 06:12:37 +01:00
l10n daemon script
cceab8c12a GIT_SILENT made messages (after extraction) 2020-12-07 02:28:32 +01:00
Christoph Feck
b5a328b905 GIT_SILENT Update Appstream for new release 2020-12-02 23:35:55 +01:00
Christoph Feck
513b717fac GIT_SILENT Update Appstream for new release
(cherry picked from commit b5a328b905)
2020-12-02 23:35:55 +01:00
Christoph Feck
a5f3009530 GIT_SILENT Upgrade release service version to 20.12.0. 2020-12-02 22:53:12 +01:00
Christoph Feck
2b1f48b92a GIT_SILENT Upgrade release service version to 20.11.90. 2020-11-25 02:29:59 +01:00
l10n daemon script
617f237d4e 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"
2020-11-18 10:23:39 +01:00
l10n daemon script
dcc1bb2de5 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"
2020-11-18 06:35:41 +01:00
l10n daemon script
14aa98ccca 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"
2020-11-12 06:23:56 +01:00
l10n daemon script
717607b1c6 GIT_SILENT made messages (after extraction) 2020-11-12 02:27:33 +01:00
l10n daemon script
4e0aa9c78b 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"
2020-11-11 10:36:42 +01:00
Albert Astals Cid
e34043d514 GIT_SILENT Upgrade release service version to 21.03.70. 2020-11-08 18:56:33 +01:00
Albert Astals Cid
8010c34bf1 GIT_SILENT Upgrade release service version to 20.11.80. 2020-11-08 18:09:43 +01:00
l10n daemon script
5610c0a292 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"
2020-11-01 06:35:22 +01:00
l10n daemon script
280c852a4e GIT_SILENT made messages (after extraction) 2020-11-01 02:26:28 +01:00
Christoph Feck
6518c17362 GIT_SILENT Update Appstream for new release
(cherry picked from commit 4b3caa10f2)
2020-10-31 18:29:34 +01:00
l10n daemon script
fcad3620db GIT_SILENT made messages (after extraction) 2020-10-31 02:21:18 +01:00
Tobias Junghans
de7050d8b7 pipewire: fix version check 2020-10-23 14:59:08 +02:00