l10n daemon script
674b9ecf20
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-05-24 05:30:14 +02:00
l10n daemon script
e80ebab9db
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-02-25 05:27:39 +01:00
Kai Uwe Broulik
595fd88054
[Examples] Fix build
...
* Add QStringLiteral et al where appropriate
* Also add override keyword to avoid warnings
* Minor style changes and cleanups
Differential Revision: https://phabricator.kde.org/D10092
2018-01-26 15:48:27 +01:00
Montel Laurent
7f0c023d3f
Use nullptr + add explicit
2017-12-13 07:36:22 +01:00
l10n daemon script
673a8a7dd9
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-10-17 05:06:20 +02:00
l10n daemon script
24193527bf
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-08-11 04:56:36 +02:00
l10n daemon script
bba40b9b9d
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-02-05 06:07:10 +01:00
l10n daemon script
793441b77b
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 12:53:44 +01:00
l10n daemon script
71b8f9b22d
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:25:38 +00:00
l10n daemon script
087c10cd43
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-02-05 09:18:18 +00:00
l10n daemon script
3dac19023c
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-02-02 10:51:53 +00:00
l10n daemon script
bd10d78e1e
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-22 09:52:02 +00:00
l10n daemon script
01f4cf59ea
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:07:45 +00:00
l10n daemon script
98583160cb
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-08-28 10:20:30 +00:00
l10n daemon script
b7e5392a7b
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-03-19 09:50:52 +00:00
l10n daemon script
03bae89ac5
SVN_SILENT made messages (.desktop file)
2015-02-04 08:58:49 +00:00
l10n daemon script
fb4932bf3c
SVN_SILENT made messages (.desktop file)
2015-01-26 09:01:51 +00:00
Kevin Funk
9dda1204c8
Run convert-to-cmake-automoc.pl over files
2015-01-20 00:00:31 +01:00
Alex Merry
48e9c2f29e
Update installation variables.
2015-01-10 17:47:31 +00:00
Elias Probst
2f2e7ca0f1
Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json().
...
REVIEW: 121958
2015-01-09 20:49:12 +01:00
l10n daemon script
1afbc2c461
SVN_SILENT made messages (.desktop file)
2015-01-02 09:15:04 +00:00
l10n daemon script
f64207f408
SVN_SILENT made messages (.desktop file)
2014-12-14 08:54:42 +00:00
l10n daemon script
d47e417e40
SVN_SILENT made messages (.desktop file)
2014-12-07 08:47:50 +00:00
l10n daemon script
cf3898f7a9
SVN_SILENT made messages (.desktop file)
2014-12-01 08:51:21 +00:00
l10n daemon script
43049221ab
SVN_SILENT made messages (.desktop file)
2014-11-12 08:52:06 +00:00
l10n daemon script
150f24b30c
SVN_SILENT made messages (.desktop file)
2014-10-27 08:35:46 +00:00
l10n daemon script
4a4e3dc526
SVN_SILENT made messages (.desktop file)
2014-10-23 08:55:08 +00:00
l10n daemon script
edc9eae84b
SVN_SILENT made messages (.desktop file)
2014-09-10 08:47:20 +00:00
l10n daemon script
dc61b4d5c2
SVN_SILENT made messages (.desktop file)
2014-09-04 08:36:35 +00:00
l10n daemon script
8afadc6410
SVN_SILENT made messages (.desktop file)
2014-07-10 04:23:58 +00:00
l10n daemon script
b06bb52100
SVN_SILENT made messages (.desktop file)
2014-06-29 08:42:52 +00:00
l10n daemon script
ac4f519188
SVN_SILENT made messages (.desktop file)
2014-06-23 08:35:39 +00:00
l10n daemon script
b092bbed31
SVN_SILENT made messages (.desktop file)
2014-06-12 08:31:04 +00:00
l10n daemon script
5ab5d89fea
SVN_SILENT made messages (.desktop file)
2014-06-07 08:25:46 +00:00
l10n daemon script
fd1674450e
SVN_SILENT made messages (.desktop file)
2014-05-25 08:47:48 +00:00
l10n daemon script
2ba1a0c90f
SVN_SILENT made messages (.desktop file)
2014-05-23 08:16:11 +00:00
l10n daemon script
db8da9ff8d
SVN_SILENT made messages (.desktop file)
2014-05-20 10:48:03 +00:00
Sebastian Kügler
1f80c23bd5
Fix build with examples
2014-05-19 23:53:25 +02:00
l10n daemon script
14ab84f5cc
SVN_SILENT made messages (.desktop file)
2014-05-18 08:22:25 +00:00
l10n daemon script
1b3060649c
SVN_SILENT made messages (.desktop file)
2014-05-14 08:29:33 +00:00
l10n daemon script
5713f72542
SVN_SILENT made messages (.desktop file)
2014-05-03 08:34:24 +00:00
l10n daemon script
d55335d2a9
SVN_SILENT made messages (.desktop file)
2014-05-02 08:52:44 +00:00
l10n daemon script
238bc54c5b
SVN_SILENT made messages (.desktop file)
2014-04-29 10:13:52 +00:00
l10n daemon script
012b0681c9
SVN_SILENT made messages (.desktop file)
2014-04-29 04:51:45 +00:00
l10n daemon script
d2f752597f
SVN_SILENT made messages (.desktop file)
2014-04-28 15:59:04 +00:00
l10n daemon script
8fcd320f27
SVN_SILENT made messages (.desktop file)
2014-04-28 12:45:07 +00:00
l10n daemon script
b9130c7c24
SVN_SILENT made messages (.desktop file)
2014-04-28 09:02:00 +00:00
l10n daemon script
880da9b195
SVN_SILENT made messages (.desktop file)
2014-04-28 05:09:56 +00:00
l10n daemon script
dfd425ae82
SVN_SILENT made messages (.desktop file)
2014-04-27 21:04:10 +00:00
l10n daemon script
cbf1e988e9
SVN_SILENT made messages (.desktop file)
2014-04-27 16:44:26 +00:00