Commit Graph

96 Commits (465774f334711455ca26e20ecb11bcb28b77910c)

Author SHA1 Message Date
Michail Vourlakos b72037af7e update to v0.10.7 3 years ago
Michail Vourlakos 380d62b0b1 update version to v0.10.6 3 years ago
Michail Vourlakos d0ce28ef7d update to v0.10.5 3 years ago
Michail Vourlakos 2f01f8cb59 update to v0.10.4 3 years ago
Michail Vourlakos 33aa5d9195 update to v0.10.3 3 years ago
Michail Vourlakos 1928c680fb update to v0.10.2 3 years ago
Michail Vourlakos 37ec4a3a25 update to v0.10.1 4 years ago
Michail Vourlakos b7188ab7c3 update to v0.10.0 4 years ago
Michail Vourlakos a11a56b4d2 update to v0.9.98 4 years ago
Michail Vourlakos 60cef9638d update to version 0.9.97 4 years ago
Michail Vourlakos cf1a008791 update to prebeta v0.9.91 4 years ago
l10n daemon script ddcc2bbe6b 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"
4 years ago
Michail Vourlakos 0cfd578a2b update to 0.9.86 to clarify settings changes 5 years ago
l10n daemon script 5832978fbf 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"
5 years ago
l10n daemon script 8b6ae2439a 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"
5 years ago
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"
5 years ago
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"
5 years ago
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"
5 years ago
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"
5 years ago
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"
5 years ago
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"
5 years ago
l10n daemon script 39bb6efb21 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"
5 years ago
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"
5 years ago
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"
5 years ago
Michail Vourlakos 702b53493b Merge branch 'v0.9' into fix 5 years ago
Michail Vourlakos 0a78fc01b8 update to version 0.9.4 5 years ago
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"
5 years ago
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"
5 years ago
Michail Vourlakos 27aea9b4f6 update to version 0.9.3 5 years ago
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"
5 years ago
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"
5 years ago
Michail Vourlakos cf5747646d update to version 0.9.2 6 years ago
Michail Vourlakos 82fae53926 update webpages and releases metadata 6 years ago
Michail Vourlakos 48ae720671 update webpages and releases metadata 6 years ago
Yuri Chornoivan 2a85545db8 Fix project_license tag for plasmoid 6 years ago
Yuri Chornoivan 069f5222c5 Fix project_license tag for plasmoid 6 years ago
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"
6 years ago
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"
6 years ago
Michail Vourlakos 9c3ca1f122 update to v0.9.85
--full development version to distinguish it
for the stable branch v0.9.x
6 years ago
Michail Vourlakos 6cc09eae4b update to v0.9.1 6 years ago
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"
6 years ago
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"
6 years ago
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"
6 years ago
Michail Vourlakos 6bc9949f9c update to version v0.9.0
--new major stable branch for v0.9.x
6 years ago
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"
6 years ago
Michail Vourlakos 750f05dc3b beta release v0.8.97 (for upcoming v0.9)
--first beta release to give to the public
6 years ago
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"
6 years ago
Michail Vourlakos 6c89317cbc update to beta version 0.8.96 6 years ago
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"
6 years ago
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"
6 years ago