github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,336 Commits
15 Branches
48 Tags
20 MiB
Commit Graph

72 Commits (ceda380e49f2c02aa71571f642806ae788f6fe8e)

Author SHA1 Message Date
l10n daemon script abeadb5794 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"
Michail Vourlakos 6efeaa7d51 update code to new astyle conditions
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"
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"
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"
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"
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"
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"
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"
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"
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"
Michail Vourlakos f5be222bfe enable Layouts menu after hiding it
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"
Michail Vourlakos d28ca2707d use dbus functions for contextmenu
Michail Vourlakos be1963c53b attemp to fix online builds
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"
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"
Michail Vourlakos 036bccb6bd show active layouts in menu with bold
Michail Vourlakos f9afa1bc1f move completely to containmentactions
Michail Vourlakos 5660e0ec9c preparing layouts menu in containmentactions
Michail Vourlakos 82e77f7b23 more improvements to containmentactions
Michail Vourlakos d3756e0ce1 add containmentactions