l10n daemon script
|
f6b501c2c9
|
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-10-08 09:56:21 +00:00 |
|
l10n daemon script
|
9dba2c6e9a
|
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-10-07 09:29:34 +00:00 |
|
Burkhard Lück
|
4c83b45422
|
fix warning in json file, Scripty seems to be very pedantic here
|
2016-10-06 20:46:13 +02:00 |
|
Albert Vaca
|
0dbaceafa3
|
Merge branch 'master' into 1.x
# Conflicts:
# plugins/battery/kdeconnect_battery.json
# plugins/clipboard/kdeconnect_clipboard.json
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/kdeconnect.notifyrc
# plugins/lockdevice/kdeconnect_lockdevice.json
# plugins/mousepad/kdeconnect_mousepad.json
# plugins/mpriscontrol/kdeconnect_mpriscontrol.json
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/pausemusic/kdeconnect_pausemusic.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
# plugins/sendnotifications/kdeconnect_sendnotifications.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/sftp/kdeconnect_sftp.json
# plugins/share/kdeconnect_share.json
# plugins/telephony/kdeconnect_telephony.json
|
2016-09-29 10:53:29 +02:00 |
|
l10n daemon script
|
167fd6cf59
|
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-09-28 11:51:45 +00:00 |
|
l10n daemon script
|
e884c4a9ac
|
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-09-18 09:32:51 +00:00 |
|
l10n daemon script
|
2d56c59386
|
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-09-14 09:17:50 +00:00 |
|
Frederik Schwarzer
|
471148f6ab
|
Fix wording.
|
2016-06-02 21:04:02 +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 |
|
Albert Vaca
|
0b5fbe00bb
|
Split plugins for sending and receiving notifications
CCMAIL: holger.k@elberer.de
|
2016-05-25 12:49:13 -06:00 |
|