Martin Gräßlin
|
89058173f7
|
Merge branch 'Plasma/5.9'
|
2017-03-24 17:08:15 +01:00 |
|
Martin Gräßlin
|
3ab0de5e18
|
Merge branch 'Plasma/5.8' into Plasma/5.9
|
2017-03-24 17:06:09 +01:00 |
|
l10n daemon script
|
8725f2441e
|
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-03-22 05:17:38 +01:00 |
|
l10n daemon script
|
3836e04881
|
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-03-22 05:00:58 +01:00 |
|
l10n daemon script
|
5f0b92bac5
|
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-03-22 04:02:11 +01:00 |
|
l10n daemon script
|
6660431ce1
|
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-03-07 14:39:25 +01:00 |
|
l10n daemon script
|
bb4005ec50
|
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-23 08:18:46 +01:00 |
|
l10n daemon script
|
3fcb19f42f
|
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-23 06:22:20 +01:00 |
|
l10n daemon script
|
26339e6d6c
|
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-13 05:52:41 +01:00 |
|
l10n daemon script
|
add47b39fe
|
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-21 06:45:37 +01:00 |
|
l10n daemon script
|
c855555903
|
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-13 04:11:59 +01:00 |
|
l10n daemon script
|
b545785325
|
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-13 09:54:01 +00:00 |
|
l10n daemon script
|
6ae917d7f8
|
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-13 10:27:05 +00:00 |
|
l10n daemon script
|
ab459fb126
|
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-08-28 11:30:20 +00:00 |
|
l10n daemon script
|
0990566c63
|
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-05-31 11:06:54 +00:00 |
|
l10n daemon script
|
aa0f2c88f0
|
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-10 11:46:53 +00:00 |
|
l10n daemon script
|
7b23cbc13e
|
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-14 10:29:43 +00:00 |
|
Thomas Lübking
|
86f2a71b9a
|
ensure to cancel animation on p-re-invocation
BUG: 356381
FIXED-IN: 5.5.1
REVIEW: 126277
|
2015-12-08 20:32:56 +01:00 |
|
l10n daemon script
|
3433b05c97
|
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:27:21 +00:00 |
|
l10n daemon script
|
c342be5961
|
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-03 11:20:49 +00:00 |
|
l10n daemon script
|
3c96b23c17
|
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-26 10:22:10 +00:00 |
|
l10n daemon script
|
726b1addd2
|
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-07-09 11:30:25 +00:00 |
|
l10n daemon script
|
b5b8dee854
|
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-06-28 10:04:21 +00:00 |
|
l10n daemon script
|
99237c9b3f
|
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-06-01 10:08:03 +00:00 |
|
l10n daemon script
|
d0e5e86a30
|
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-05-26 13:53:12 +00:00 |
|
l10n daemon script
|
7724edac14
|
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-05-20 09:47:00 +00:00 |
|
l10n daemon script
|
dc19c0ed02
|
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-04-27 10:23:00 +00:00 |
|
l10n daemon script
|
f4e2e0e2e9
|
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-04-25 10:26:32 +00:00 |
|
l10n daemon script
|
7037327ec4
|
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-04-23 10:15:53 +00:00 |
|
l10n daemon script
|
a00f1f3ad4
|
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-04-21 13:24:50 +00:00 |
|
l10n daemon script
|
5cd7658930
|
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-04-18 10:28:01 +00:00 |
|
l10n daemon script
|
ef748afe63
|
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-04-17 11:43:23 +00:00 |
|
l10n daemon script
|
cb08f61786
|
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-04-11 10:29:16 +00:00 |
|
l10n daemon script
|
c05e355003
|
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-04-10 10:24:56 +00:00 |
|
l10n daemon script
|
c8de289e6f
|
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-04-09 10:02:17 +00:00 |
|
Thomas Lübking
|
fb39fafc71
|
add eye On Screen effect for showing desktop
resembles the homescreen effect on "eye" OS
REVIEW: 122679
|
2015-04-07 23:59:18 +02:00 |
|