marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2371 commits 1 branch 0 tags 40 MiB
Commit graph

12 commits

Author SHA1 Message Date
l10n daemon script
4b911fa0bc 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"
 2023-04-03 02:25:31 +00:00
Devin Lin
28a780a7d3 kwin/convergentwindows: Convert to declarative script 2023-03-25 23:07:18 -07:00
l10n daemon script
68b94f31b3 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"
 2023-03-21 02:44:34 +00:00
l10n daemon script
872d63c5c2 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"
 2023-03-16 02:34:43 +00:00
l10n daemon script
c9d1ec9c6a 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"
 2023-03-13 02:49:01 +00:00
l10n daemon script
cc7fac30e8 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"
 2023-03-11 02:59:39 +00:00
l10n daemon script
8ba56dc286 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"
 2023-03-10 02:43:40 +00:00
l10n daemon script
565e752a55 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"
 2023-03-09 02:33:03 +00:00
l10n daemon script
064ceaa1da 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"
 2023-03-08 02:41:57 +00:00
l10n daemon script
7d410d2fdb 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"
 2023-03-07 02:40:31 +00:00
Yari Polla
847529751e metadata: port to KPackageStructure 2023-03-07 00:52:30 +01:00
Devin Lin
987b280f12 kwin/scripts: Add convergentwindows and switch from kwin maximized mode 2023-03-06 05:57:45 +00:00