Aleix Pol
|
5804514d08
|
This capability was renamed at some point: 5f8356b6db
|
2016-06-06 01:21:37 +02:00 |
|
Aleix Pol
|
e7578cc129
|
Refactor capabilities together with Albert
He is committing a similar patch to kdeconnect-android
|
2016-05-31 17:16:01 +02:00 |
|
l10n daemon script
|
9df0fc1e24
|
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"
|
2016-01-31 09:40:47 +00:00 |
|
l10n daemon script
|
a0c1a57999
|
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-12-30 09:23:05 +00:00 |
|
l10n daemon script
|
6434909e79
|
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-12-29 11:22:52 +00:00 |
|
l10n daemon script
|
2ca1d9720e
|
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-12-03 09:40:02 +00:00 |
|
l10n daemon script
|
fc2bd97e69
|
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-11-17 12:54:36 +00:00 |
|
l10n daemon script
|
0145c837db
|
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-11-11 10:30:30 +00:00 |
|
l10n daemon script
|
e424bcec1a
|
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-11-04 17:00:05 +00:00 |
|
l10n daemon script
|
47ee991548
|
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-10-01 10:36:43 +00:00 |
|
l10n daemon script
|
933cbd5bfd
|
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-09-13 10:31:01 +00:00 |
|
l10n daemon script
|
5795e27191
|
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-09-10 11:33:23 +00:00 |
|
l10n daemon script
|
e6a759a071
|
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-09-01 12:31:29 +00:00 |
|
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 |
|