l10n daemon script
|
ce354aae44
|
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-08-11 13:21:00 +00:00 |
|
l10n daemon script
|
f3411bb8dd
|
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-08-10 10:15:07 +00:00 |
|
Aleix Pol
|
84f93ad0b5
|
Eh... copypaste
|
2015-08-07 15:02:06 +02:00 |
|
l10n daemon script
|
6dc0c048e2
|
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-08-06 10:23:02 +00:00 |
|
l10n daemon script
|
43161b3932
|
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-08-01 10:37:53 +00:00 |
|
l10n daemon script
|
a0aa62dd04
|
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-07-29 09:16:57 +00:00 |
|
l10n daemon script
|
121b6ee64a
|
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-07-25 11:30:20 +00:00 |
|
l10n daemon script
|
bf51ceb600
|
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-07-24 09:52:53 +00:00 |
|
l10n daemon script
|
647d09b6fc
|
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-07-23 10:34:29 +00:00 |
|
l10n daemon script
|
eb5c099661
|
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-07-22 10:07:40 +00:00 |
|
Aleix Pol
|
058f7c7c90
|
Implement the touchpad forwarding into kcapp
This way the computer's cursor can be controlled from the device. Keyboard
is not yet implemented.
|
2015-07-22 03:21:28 +02:00 |
|