1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +03:00

26 Commits

Author SHA1 Message Date
l10n daemon script
b618ddc626 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"
2018-10-20 07:54:59 +02:00
l10n daemon script
d39028104b 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"
2018-09-03 07:42:49 +02:00
l10n daemon script
47f96e1e05 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"
2018-08-20 07:23:51 +02:00
l10n daemon script
fe6531ce12 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"
2018-08-03 07:24:39 +02:00
l10n daemon script
3dfccee59b 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"
2018-07-10 07:23:49 +02:00
Michail Vourlakos
6efeaa7d51 update code to new astyle conditions 2018-07-03 22:15:45 +03:00
l10n daemon script
bc93683d25 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"
2018-06-25 05:22:31 +02:00
l10n daemon script
f6097cd2dc 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"
2018-06-16 05:30:04 +02:00
l10n daemon script
972a56bd69 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"
2018-06-11 05:41:22 +02:00
l10n daemon script
680032c222 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"
2018-04-23 05:24:11 +02:00
l10n daemon script
403117e044 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"
2018-04-15 05:21:37 +02:00
l10n daemon script
5c164f671c 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"
2018-03-26 05:03:59 +02:00
l10n daemon script
cb6d7bda74 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"
2018-02-19 04:57:38 +01:00
l10n daemon script
30b7f42308 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"
2018-02-17 04:59:54 +01:00
l10n daemon script
86aac1fa4b 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"
2018-02-13 05:13:52 +01:00
Michail Vourlakos
f5be222bfe enable Layouts menu after hiding it 2018-02-12 23:54:34 +02:00
l10n daemon script
87c0b5b319 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"
2018-02-12 05:13:16 +01:00
Michail Vourlakos
d28ca2707d use dbus functions for contextmenu 2018-02-07 00:06:51 +02:00
Michail Vourlakos
be1963c53b attemp to fix online builds 2018-02-06 20:28:09 +02:00
l10n daemon script
aa3a9b2411 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"
2018-02-06 05:12:53 +01:00
l10n daemon script
e6f275939a 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"
2018-02-05 05:07:21 +01:00
Michail Vourlakos
036bccb6bd show active layouts in menu with bold 2018-02-04 02:53:17 +02:00
Michail Vourlakos
f9afa1bc1f move completely to containmentactions 2018-02-03 23:31:03 +02:00
Michail Vourlakos
5660e0ec9c preparing layouts menu in containmentactions 2018-02-03 22:19:35 +02:00
Michail Vourlakos
82e77f7b23 more improvements to containmentactions 2018-02-03 21:56:05 +02:00
Michail Vourlakos
d3756e0ce1 add containmentactions 2018-02-03 20:56:30 +02:00