Simon Redman
|
f270a27018
|
Add description for presentation remote
|
2019-07-30 18:36:54 +02:00 |
|
l10n daemon script
|
b7a6b1f00e
|
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"
|
2019-07-23 05:10:46 +02:00 |
|
l10n daemon script
|
e6f8a391c9
|
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"
|
2019-07-19 05:32:47 +02:00 |
|
l10n daemon script
|
01e52aa9c9
|
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"
|
2019-07-18 05:17:20 +02:00 |
|
l10n daemon script
|
38a8b9ccaf
|
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"
|
2019-07-15 05:00:47 +02:00 |
|
l10n daemon script
|
1ecd7edc62
|
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"
|
2019-07-14 05:10:33 +02:00 |
|
l10n daemon script
|
b68c82a8c3
|
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"
|
2019-07-12 05:12:34 +02:00 |
|
l10n daemon script
|
6d56f6a908
|
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"
|
2019-07-10 05:22:58 +02:00 |
|
l10n daemon script
|
c53108bb25
|
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"
|
2019-07-08 04:56:21 +02:00 |
|
l10n daemon script
|
c6f5f83359
|
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"
|
2019-07-07 05:14:19 +02:00 |
|
l10n daemon script
|
fd1fbcbea4
|
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"
|
2019-07-06 05:12:35 +02:00 |
|
Aleix Pol
|
a40c6e8101
|
Submitted proof of concept for a presenter plugin
Will show a cursor so we can point at interesting things on the screen during
presentations.
|
2019-07-05 17:58:46 +02:00 |
|