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"
|
7 years ago |
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"
|
7 years ago |
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"
|
7 years ago |
Michail Vourlakos
|
f5be222bfe
|
enable Layouts menu after hiding it
|
7 years ago |
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"
|
7 years ago |
Michail Vourlakos
|
d28ca2707d
|
use dbus functions for contextmenu
|
7 years ago |
Michail Vourlakos
|
be1963c53b
|
attemp to fix online builds
|
7 years ago |
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"
|
7 years ago |
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"
|
7 years ago |
Michail Vourlakos
|
036bccb6bd
|
show active layouts in menu with bold
|
7 years ago |
Michail Vourlakos
|
f9afa1bc1f
|
move completely to containmentactions
|
7 years ago |
Michail Vourlakos
|
5660e0ec9c
|
preparing layouts menu in containmentactions
|
7 years ago |
Michail Vourlakos
|
82e77f7b23
|
more improvements to containmentactions
|
7 years ago |
Michail Vourlakos
|
d3756e0ce1
|
add containmentactions
|
7 years ago |