Commit graph

106 commits

Author SHA1 Message Date
l10n daemon script
42a3029b0e 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-14 10:22:08 +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
71874dbffb 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-12 11:52:20 +00:00
Albert Vaca
b7eefa0388 Fixed warning. 2015-09-12 03:37:05 -07:00
Aleix Pol
c6a157e50a Remove unused variable 2015-09-12 09:48:31 +02:00
David Edmundson
9985a59608 Find my phone plugin
Add a plugin that sends a package to ring an alarm on a phone

Also adjusts plasmoid to have a button to invoke this.
2015-09-11 21:12:12 +02:00