Commit graph

38 commits

Author SHA1 Message Date
l10n daemon script
5fd09c904d 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"
2020-02-14 05:56:20 +01:00
l10n daemon script
c61a67f86a 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"
2020-02-04 06:10:13 +01:00
l10n daemon script
c54104b24f 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"
2020-01-09 05:46:17 +01:00
l10n daemon script
835be41511 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"
2019-12-25 05:45:20 +01:00
l10n daemon script
b830c8f33b 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"
2019-12-19 05:49:03 +01:00
l10n daemon script
56880448fd 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"
2019-11-30 05:34:44 +01:00
l10n daemon script
cb307e16b2 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"
2019-11-17 05:06:27 +01:00
l10n daemon script
caa3e159c9 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"
2019-10-10 05:23:28 +02:00
l10n daemon script
55b7533251 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"
2019-09-27 05:08:50 +02:00
l10n daemon script
81e8d3a700 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"
2019-09-25 05:17:51 +02:00
l10n daemon script
6baa2ff976 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"
2019-09-03 05:13:28 +02:00
Piyush Aggarwal
8060889365 Fix presenter plugin for Win32 2019-08-17 23:42:17 +00:00
l10n daemon script
34cd332829 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"
2019-08-17 05:04:07 +02:00
l10n daemon script
c5b769508c 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"
2019-08-12 05:05:01 +02:00
l10n daemon script
7e13968547 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"
2019-08-08 04:53:53 +02:00
l10n daemon script
2d2cf7444a 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"
2019-08-07 05:00:07 +02:00
l10n daemon script
688a7df097 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"
2019-08-06 04:49:33 +02:00
l10n daemon script
388d75bff3 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"
2019-08-04 05:06:40 +02:00
l10n daemon script
28e339571b 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"
2019-08-02 04:50:15 +02:00
l10n daemon script
5427754e21 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"
2019-08-01 04:51:32 +02:00
Simon Redman
f270a27018 Add description for presentation remote 2019-07-30 18:36:54 +02:00
Matthijs Tijink
d96bafe9d4 Prevent taskbar from showing for presenter when in full-screen mode
The taskbar entry still shows up, but isn't displayed over other
full-screen applications
2019-07-25 18:18:01 +00:00
l10n daemon script
b7a6b1f00e 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"
2019-07-23 05:10:46 +02:00
Albert Vaca Cintora
9a4bb293a7 Receive deltas instead of abs positions from phone 2019-07-21 12:27:23 +02:00
Albert Vaca Cintora
0d13da9786 Support stop packet 2019-07-21 12:27:23 +02:00
Matthijs Tijink
aa7d6d2339 Fix devicePixelRatio in presenter plugin 2019-07-21 10:54:03 +02:00
Aleix Pol
2ef3c0ce54 presenter: tweak the particles so they can be seen on white background 2019-07-20 10:06:26 +02:00
Aleix Pol
0d26b037c4 presenter plugin: reduce disappear timeout to 500ms
In contrast to 2000ms
2019-07-19 23:24:09 +02:00
l10n daemon script
e6f8a391c9 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"
2019-07-19 05:32:47 +02:00
l10n daemon script
01e52aa9c9 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"
2019-07-18 05:17:20 +02:00
l10n daemon script
38a8b9ccaf 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"
2019-07-15 05:00:47 +02:00
l10n daemon script
1ecd7edc62 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"
2019-07-14 05:10:33 +02:00
l10n daemon script
b68c82a8c3 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"
2019-07-12 05:12:34 +02:00
l10n daemon script
6d56f6a908 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"
2019-07-10 05:22:58 +02:00
l10n daemon script
c53108bb25 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"
2019-07-08 04:56:21 +02:00
l10n daemon script
c6f5f83359 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"
2019-07-07 05:14:19 +02:00
l10n daemon script
fd1fbcbea4 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"
2019-07-06 05:12:35 +02:00
Aleix Pol
a40c6e8101 Submitted proof of concept for a presenter plugin
Will show a cursor so we can point at interesting things on the screen during
presentations.
2019-07-05 17:58:46 +02:00