Commit graph

15 commits

Author SHA1 Message Date
l10n daemon script
e8d2bfe884 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-11-04 09:46:15 +00:00
l10n daemon script
857bc9af3c 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-21 09:30:44 +00:00
l10n daemon script
7391459e8f 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-15 10:01:47 +00:00
l10n daemon script
8414b59811 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-11 10:34:23 +00:00
l10n daemon script
82d0f49377 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-10 09:46:25 +00:00
l10n daemon script
b78920f905 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:58:17 +00:00
Marco Martin
c2eca129af try to start an activity before setting current 2016-10-07 12:53:30 +02:00
l10n daemon script
3577e59bc0 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:31:42 +00:00
Marco Martin
e64fda4a63 close panel when an applet wants to close 2016-10-05 18:03:41 +02:00
Marco Martin
efc09b0011 hide edit boxes when needed 2016-10-05 17:34:32 +02:00
Marco Martin
c8eef2e789 new button on top 2016-10-05 16:47:16 +02:00
Marco Martin
4eec991a3c correct highlighted activity 2016-10-05 15:39:37 +02:00
Marco Martin
b413f8b664 remove activities with swipe away 2016-10-05 15:26:57 +02:00
Marco Martin
43f05e4cae improve activities applet
add it by default in panel
2016-10-05 15:15:28 +02:00
Marco Martin
cadbf60056 add a very simple activity switcher 2016-09-05 16:05:48 +02:00