l10n daemon script
|
99237c9b3f
|
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"
|
2015-06-01 10:08:03 +00:00 |
|
l10n daemon script
|
d0e5e86a30
|
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"
|
2015-05-26 13:53:12 +00:00 |
|
l10n daemon script
|
7724edac14
|
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"
|
2015-05-20 09:47:00 +00:00 |
|
l10n daemon script
|
dc19c0ed02
|
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"
|
2015-04-27 10:23:00 +00:00 |
|
l10n daemon script
|
f4e2e0e2e9
|
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"
|
2015-04-25 10:26:32 +00:00 |
|
l10n daemon script
|
7037327ec4
|
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"
|
2015-04-23 10:15:53 +00:00 |
|
l10n daemon script
|
a00f1f3ad4
|
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"
|
2015-04-21 13:24:50 +00:00 |
|
l10n daemon script
|
5cd7658930
|
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"
|
2015-04-18 10:28:01 +00:00 |
|
l10n daemon script
|
ef748afe63
|
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"
|
2015-04-17 11:43:23 +00:00 |
|
l10n daemon script
|
53392ea009
|
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"
|
2015-04-14 13:53:56 +00:00 |
|
l10n daemon script
|
cb08f61786
|
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"
|
2015-04-11 10:29:16 +00:00 |
|
l10n daemon script
|
c05e355003
|
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"
|
2015-04-10 10:24:56 +00:00 |
|
l10n daemon script
|
c8de289e6f
|
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"
|
2015-04-09 10:02:17 +00:00 |
|
Thomas Lübking
|
0103b0fee6
|
Add Window Aperture effect for showing the desktop
It moves windows to nearest corners
|
2015-04-07 23:59:18 +02:00 |
|