Laurent Montel
|
326d58a439
|
GIT_SILENT: don't use deprecated cmake variable
|
2021-02-08 07:05:59 +01:00 |
|
Stefan Brüns
|
76c2f08c9e
|
Declare and use logging categories
Adds the following logging categories:
- krfb.krfb (KRFB application)
- krfb.framebuffer.qt (Qt Framebuffer plugin)
- krfb.framebuffer.xcb (XCB Framebuffer plugin)
|
2020-08-13 20:17:39 +02:00 |
|
l10n daemon script
|
10923d2e01
|
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-06-18 05:39:49 +02:00 |
|
l10n daemon script
|
e824ea5534
|
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-06-17 14:07:28 +02:00 |
|
l10n daemon script
|
f178121c54
|
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-03-27 06:34:06 +01:00 |
|
l10n daemon script
|
a360e5c8ae
|
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-31 05:17:18 +02:00 |
|
l10n daemon script
|
b0712e1874
|
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-27 05:15:30 +02:00 |
|
l10n daemon script
|
87ad1774a2
|
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-22 05:10:18 +02:00 |
|
l10n daemon script
|
576cef1a12
|
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-05-26 05:18:37 +02:00 |
|
Alexey Min
|
6ecb4248b8
|
Fix warning when compiling with Qt >= 5.10
|
2019-05-18 02:05:16 +03:00 |
|
Friedrich W. H. Kossebau
|
c57e9bc5f4
|
Use more https in links
|
2019-01-19 15:58:29 +01:00 |
|
l10n daemon script
|
258e8bd22b
|
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"
|
2018-10-24 06:00:33 +02:00 |
|
l10n daemon script
|
54fd606e82
|
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"
|
2018-10-10 06:40:00 +02:00 |
|
Friedrich W. H. Kossebau
|
d1273a8f56
|
Remove unused plugin metadata desktop files
Plugins had been converted to direct JSON metadata in
10176b9e01
|
2018-07-17 16:52:20 +02:00 |
|
Friedrich W. H. Kossebau
|
6373c44b8d
|
Remove unneeded "Encoding" entry from plugin metadata
|
2018-07-17 16:49:37 +02:00 |
|
Friedrich W. H. Kossebau
|
b1df09d2bf
|
Consistently use override
|
2018-07-17 14:40:23 +02:00 |
|
Friedrich W. H. Kossebau
|
da36f0a7fb
|
Consistently use nullptr
|
2018-07-17 14:38:06 +02:00 |
|
Friedrich W. H. Kossebau
|
798fc5c2e6
|
Remove unneeded moc includes
|
2018-07-17 14:27:20 +02:00 |
|
l10n daemon script
|
2fee3471f5
|
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"
|
2017-12-20 07:05:07 +01:00 |
|
l10n daemon script
|
4b01a1cac7
|
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"
|
2017-04-23 04:05:02 +02:00 |
|
l10n daemon script
|
77ef270323
|
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"
|
2017-04-14 03:58:43 +02:00 |
|
l10n daemon script
|
8eecd9097e
|
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"
|
2017-04-09 04:03:05 +02:00 |
|
Alexey Min
|
4974154cc3
|
Qt framebuffer plugin: Do not use deprecated QPixmap::grabWindow(), use QScreen::grabWindow() instead
REVIEW: 129722
|
2017-03-24 00:11:49 +01:00 |
|
l10n daemon script
|
e761ee832e
|
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"
|
2017-01-03 12:34:42 +01:00 |
|
l10n daemon script
|
699d7f9a27
|
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-12-20 13:09:16 +01:00 |
|
l10n daemon script
|
43083c52dc
|
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-12-17 05:50:49 +01:00 |
|
l10n daemon script
|
2885bf2c5a
|
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-12-02 04:33:40 +01:00 |
|
l10n daemon script
|
6544fd56e9
|
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-30 04:27:39 +01:00 |
|
l10n daemon script
|
3fc2398707
|
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-25 05:01:57 +01:00 |
|
l10n daemon script
|
c1efd7158f
|
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-23 04:21:36 +01:00 |
|
l10n daemon script
|
631d3c85ac
|
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-15 10:19:57 +00:00 |
|
l10n daemon script
|
ae15751847
|
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-24 09:34:05 +00:00 |
|
l10n daemon script
|
b95a5b285d
|
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:19:50 +00:00 |
|
l10n daemon script
|
0ee5738bf5
|
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-09 09:26:52 +00:00 |
|
l10n daemon script
|
65595722bd
|
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-01-23 10:35:57 +00:00 |
|
l10n daemon script
|
916ffb525a
|
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-01-07 10:10:04 +00:00 |
|
Albert Astals Cid
|
ee5cb9eaf5
|
Merge remote-tracking branch 'origin/Applications/15.12'
|
2016-01-07 00:33:40 +01:00 |
|
l10n daemon script
|
964386e2a6
|
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-12-29 11:26:11 +00:00 |
|
l10n daemon script
|
0d500c00ba
|
SVN_SILENT made messages (.desktop file)
|
2015-12-17 12:27:46 +00:00 |
|
l10n daemon script
|
07439f6408
|
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-12-17 09:32:43 +00:00 |
|
l10n daemon script
|
aa0e358136
|
SVN_SILENT made messages (.desktop file)
|
2015-12-13 11:50:46 +00:00 |
|
l10n daemon script
|
464cbd8573
|
SVN_SILENT made messages (.desktop file)
|
2015-11-26 18:11:03 +00:00 |
|
l10n daemon script
|
c1904c41c7
|
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-11-26 15:56:42 +00:00 |
|
l10n daemon script
|
ac6f4ca3ed
|
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-11-17 13:00:54 +00:00 |
|
l10n daemon script
|
d2d49abf23
|
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-11-11 10:33:20 +00:00 |
|
l10n daemon script
|
396e277113
|
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-11-07 21:16:29 +00:00 |
|
l10n daemon script
|
ab7ed1c006
|
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-11-04 17:14:10 +00:00 |
|
l10n daemon script
|
a2b1c5e0b5
|
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-11-02 11:08:45 +00:00 |
|
l10n daemon script
|
f95fafe5a7
|
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-11-01 10:43:24 +00:00 |
|
l10n daemon script
|
3a9f58f12e
|
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-10-25 10:39:56 +00:00 |
|