Commit Graph

56 Commits (d97fe4c59c425b0573fe392ddd78323d972b1522)

Author SHA1 Message Date
l10n daemon script 16ccd123dd 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 d953d7bf98 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 c5072f98de 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 51a302de63 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 d0bf13aa72 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 6dac4e4065 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 3593ed48c6 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 a3e747188f 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 702b53493b Merge branch 'v0.9' into fix
l10n daemon script 12ec3bf36c 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 7554e8c409 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 32078ac05a 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 71f9e6b85a 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 1c4f5906fd 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 3faf5f6114 Merge branch 'v0.9' into merger
l10n daemon script 20a4610a85 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 1bec03ec8a 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 e5a1324862 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 57d52a78bf 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 e438e04511 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 6cd1a9b7ae 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 4c7e800ce7 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 2d8f2981be 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 b5c954bf99 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 971e67f6b3 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 064b1178e6 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 3598639740 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 32904be361 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 09147cdead 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 d9217065fe 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 42b236e8a9 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 5c09168968 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 348b617b49 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 de170d42d8 remove unneeded warning
Michail Vourlakos ba08038bc0 add Latte/Indicator type and improve metadata
Michail Vourlakos 3b8c52cc59 refactor:move lattepackage to simpler directory
Michail Vourlakos 7a3fcc7773 refactor:rename dockpackage to Latte::Package
Michail Vourlakos 2099b8ed36 add headers comments for all c++ files
Michail Vourlakos 3553415c59 load roundness theme info properly
Michail Vourlakos 6efeaa7d51 update code to new astyle conditions
Michail Vourlakos b0bb99e2a9 compress svg files
Michail Vourlakos de4cddb5d3 update internal splitter icon to use plasma theme
Michail Vourlakos 7050d7ba1f fix use svg for settings Latte trademark
--remove the Plasma Label that was used to set
the Latte trademark based on Tangerine font that
was distributed from app source code
--remove the Tangarine font from source code
Michail Vourlakos d3756e0ce1 add containmentactions
Michail Vourlakos 71281174be create a separate Types Window
Michail Vourlakos bc91aefd89 add more MultipleLayouts code
--move code from dockCorona to layoutManager
--add more code related to MultipleLayouts
Michail Vourlakos 83cd059309 remove no needed fake separator desktop file
Michail Vourlakos 2d4aeaaf51 add info window for showing latte infos
--its main purpose is to inform the user that Latte
is dynamically switching layout
Michail Vourlakos 0b8316e296 add presets for the new architecture
Michail Vourlakos 6bb14547e5 first implementation for tasks internal separator