Aleix Pol
|
596e4484f4
|
Clean up use of virtual and override keywords
Only use virtual when actually virtual, to override just use override.
|
2016-06-20 19:22:29 +02:00 |
|
l10n daemon script
|
e55be85cf5
|
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-06-13 10:44:25 +00:00 |
|
Albert Vaca
|
c89b032569
|
Merge branch 'master' into sslrefactor
|
2016-06-03 00:48:15 +02:00 |
|
Albert Vaca
|
73f5996f14
|
Consistent naming of _REQUEST package type macros
|
2016-06-03 00:47:03 +02:00 |
|
Frederik Schwarzer
|
471148f6ab
|
Fix wording.
|
2016-06-02 21:04:02 +02:00 |
|
Aleix Pol
|
ea9c6330e9
|
Fix build after merge
|
2016-05-31 17:48:55 +02:00 |
|
Aleix Pol
|
9aa794b0da
|
Merge branch 'master' into sslrefactor
|
2016-05-31 17:29:06 +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 |
|