Albert Vaca
|
ef0e80c91f
|
Merge branch 'master' into 1.x
# Conflicts:
# indicator/org.kde.kdeconnect.nonplasma.desktop
# org.kde.kdeconnect.kcm.appdata.xml
# plugins/runcommand/kdeconnect_runcommand.json
# urlhandler/org.kde.kdeconnect.telhandler.desktop
|
2017-07-24 16:49:06 +02:00 |
|
l10n daemon script
|
470fdfef81
|
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"
|
2017-07-24 05:53:15 +02:00 |
|
l10n daemon script
|
7ba311fc78
|
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"
|
2017-07-24 04:32:05 +02:00 |
|
l10n daemon script
|
9f313f94c2
|
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"
|
2017-07-23 05:44:59 +02:00 |
|
l10n daemon script
|
d276a7eb37
|
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"
|
2017-07-23 04:32:09 +02:00 |
|
l10n daemon script
|
631880083d
|
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"
|
2017-07-19 09:50:22 +02:00 |
|
l10n daemon script
|
e6f3b5bd27
|
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"
|
2017-07-18 05:56:58 +02:00 |
|
l10n daemon script
|
d8c578edc9
|
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"
|
2017-07-17 06:00:54 +02:00 |
|
l10n daemon script
|
322fcd47a5
|
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"
|
2017-07-16 06:03:07 +02:00 |
|
l10n daemon script
|
d513d9e37e
|
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"
|
2017-07-15 05:39:16 +02:00 |
|
l10n daemon script
|
cc43a72884
|
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"
|
2017-07-14 05:43:50 +02:00 |
|
l10n daemon script
|
a4c0a8fb96
|
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"
|
2017-06-30 04:28:23 +02:00 |
|
l10n daemon script
|
bb3722b144
|
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"
|
2017-06-28 08:22:58 +02:00 |
|
l10n daemon script
|
fbd7e6d383
|
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"
|
2017-06-21 08:21:46 +02:00 |
|
l10n daemon script
|
36269e6506
|
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"
|
2017-06-20 04:26:54 +02:00 |
|
l10n daemon script
|
72162bf8c9
|
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"
|
2017-06-08 04:52:02 +02:00 |
|
l10n daemon script
|
6305de985b
|
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"
|
2017-06-06 04:28:16 +02:00 |
|
l10n daemon script
|
47b4aadaa3
|
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"
|
2017-06-05 04:09:27 +02:00 |
|
l10n daemon script
|
c070b4d445
|
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"
|
2017-06-04 04:17:49 +02:00 |
|
l10n daemon script
|
ece098ac3b
|
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"
|
2017-05-31 08:06:19 +02:00 |
|
l10n daemon script
|
0d217c58e1
|
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"
|
2017-05-27 04:22:53 +02:00 |
|
l10n daemon script
|
0711dac538
|
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"
|
2017-05-26 04:21:11 +02:00 |
|
Aleix Pol
|
139bac55bc
|
Fix desktop file
Have it open kdeconnect-indicator rather than plasmawindowed
|
2017-05-24 21:57:06 +02:00 |
|