Commit Graph

65 Commits (13cecfa348a1c9b2128fd1bb34c1b0a85258906e)

Author SHA1 Message Date
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
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 5 years ago
Michail Vourlakos 82fae53926 update webpages and releases metadata 5 years ago
Michail Vourlakos 48ae720671 update webpages and releases metadata 5 years ago
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"
6 years ago
Michail Vourlakos 3faf5f6114 Merge branch 'v0.9' into merger 6 years ago
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"
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 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
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
l10n daemon script 159861b556 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 2ce6f4cc64 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 bc16b0f315 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 e8d79632bd 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 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"
6 years ago
l10n daemon script 7fd9cb1952 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 cfec678f68 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 b50a4807aa 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 ec9ad19c36 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 49d91aa19e update master version to 0.8.75 7 years ago
Michail Vourlakos 785b3029ad update to stable version 0.8.0
--after one year of work v0.8 with
its fantastic new features is here
7 years ago
Michail Vourlakos 321af85469 update to v0.7.96
--last beta with string freeze before
official release of v0.8
7 years ago
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"
7 years ago
Michail Vourlakos b3d80717c1 Beta1 for v0.8
--this is the first beta release for
v0.8. Everything will be open for the
upcoming days including translation
strings improvements. Beta2 possibly
will introduce a string freeze.
7 years ago
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"
7 years ago
l10n daemon script 3f4fa6699c 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 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"
7 years ago
Michail Vourlakos badbe7da6a update to version 0.7.79 7 years ago
l10n daemon script ed214952fc 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 bdc03805ee update version to 0.7.78 7 years ago
l10n daemon script 73940eff3b 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 6f084726a9 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 03a73a1bb0 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 46ad550b93 merging the new architecture,increase version
--because the new architecture supports both single
and multiple layouts, increasing the version is a
goog thing
7 years ago
Michail Vourlakos 63d90f1b98 update metadata versions 7 years ago
l10n daemon script 1289c64480 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 26a9f2ce61 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 451512192c 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 1e09238bd4 update version to 0.7.75 in master 7 years ago