Thomas Lübking
|
121d59ee28
|
add black/whitelist config to videowall
REVIEW: 125410
BUG: 353153
FIXED-IN: 5.5
|
2015-09-29 23:02:41 +02: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
|
9af31e8024
|
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-29 10:30:43 +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
|
4b8fabca40
|
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-22 10:30:10 +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
|
b4c8fa64b8
|
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-28 13:46:57 +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
|
7c747e1591
|
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-24 09:53:59 +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
|
e9afce7b04
|
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-19 10:17:15 +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
|
53392ea009
|
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-14 13:53:56 +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 |
Yuri Chornoivan
|
4e140399c7
|
Fix typo
|
2015-04-08 16:19:37 +03:00 |
Thomas Lübking
|
0e22088bf4
|
add "MinimizeAll" script
to compensate withdrawn core feature (which
though has been hidden so far)
|
2015-04-07 23:59:17 +02:00 |
l10n daemon script
|
01b61a9ede
|
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-16 10:12:25 +00:00 |
l10n daemon script
|
9361fb8610
|
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-15 09:56:33 +00:00 |
l10n daemon script
|
a14e62dadc
|
SVN_SILENT made messages (.desktop file)
|
2015-02-22 10:26:29 +00:00 |
l10n daemon script
|
e178851846
|
SVN_SILENT made messages (.desktop file)
|
2015-01-27 11:24:24 +00:00 |
l10n daemon script
|
bf7bf73464
|
SVN_SILENT made messages (.desktop file)
|
2015-01-15 09:02:26 +00:00 |
l10n daemon script
|
d173ff7412
|
SVN_SILENT made messages (.desktop file)
|
2015-01-13 12:47:17 +00:00 |
l10n daemon script
|
a010bbc6a7
|
SVN_SILENT made messages (.desktop file)
|
2014-11-02 21:49:41 +00:00 |
l10n daemon script
|
45b1af3165
|
SVN_SILENT made messages (.desktop file)
|
2014-10-29 08:42:18 +00:00 |
Martin Gräßlin
|
f750fef8b7
|
Merge branch 'Plasma/5.1'
Conflicts:
CMakeLists.txt
kcmkwin/kwincompositing/kcmkwineffects.desktop
kcmkwin/kwincompositing/kwincompositing.desktop
kcmkwin/kwindecoration/kwindecoration.desktop
kcmkwin/kwindesktop/desktop.desktop
kcmkwin/kwinoptions/kwinactions.desktop
kcmkwin/kwinoptions/kwinadvanced.desktop
kcmkwin/kwinoptions/kwinfocus.desktop
kcmkwin/kwinoptions/kwinmoving.desktop
kcmkwin/kwinoptions/kwinoptions.desktop
kcmkwin/kwinrules/kwinrules.desktop
kcmkwin/kwinscreenedges/kwinscreenedges.desktop
kcmkwin/kwintabbox/kwintabbox.desktop
scripts/enforcedeco/metadata.desktop
|
2014-10-28 15:03:15 +01:00 |
l10n daemon script
|
7d9831d8b4
|
SVN_SILENT made messages (.desktop file)
|
2014-10-23 08:55:48 +00:00 |
l10n daemon script
|
87878572de
|
SVN_SILENT made messages (.desktop file)
|
2014-10-21 11:18:35 +00:00 |
l10n daemon script
|
388a3162b0
|
SVN_SILENT made messages (.desktop file)
|
2014-09-30 11:34:32 +00:00 |
l10n daemon script
|
1f2bb4232b
|
SVN_SILENT made messages (.desktop file)
|
2014-09-30 10:55:14 +00:00 |
l10n daemon script
|
91ff859d5f
|
SVN_SILENT made messages (.desktop file)
|
2014-09-27 09:33:56 +00:00 |
l10n daemon script
|
857610668e
|
SVN_SILENT made messages (.desktop file)
|
2014-09-27 08:47:58 +00:00 |
l10n daemon script
|
08540b45eb
|
SVN_SILENT made messages (.desktop file)
|
2014-09-21 08:48:08 +00:00 |
l10n daemon script
|
8a620e7259
|
SVN_SILENT made messages (.desktop file)
|
2014-09-11 08:46:22 +00:00 |
l10n daemon script
|
1205c9c170
|
SVN_SILENT made messages (.desktop file)
|
2014-09-07 08:46:08 +00:00 |
Martin Gräßlin
|
c00c67bf29
|
[scripting] Drop qmlRegisterType for QQuickWindow
Not needed as one can just do:
import QtQuick.Window;
This fixes a build problem with Qt 5.4.
BUG: 338277
|
2014-09-03 09:47:21 +02:00 |
l10n daemon script
|
493e9b3238
|
SVN_SILENT made messages (.desktop file)
|
2014-09-02 10:43:26 +00:00 |
l10n daemon script
|
5114d9b5da
|
SVN_SILENT made messages (.desktop file)
|
2014-08-31 08:41:36 +00:00 |
l10n daemon script
|
f2fc577770
|
SVN_SILENT made messages (.desktop file)
|
2014-08-24 08:45:33 +00:00 |
l10n daemon script
|
36b404057d
|
SVN_SILENT made messages (.desktop file)
|
2014-08-15 09:08:57 +00:00 |
l10n daemon script
|
1478a08c31
|
SVN_SILENT made messages (.desktop file)
|
2014-08-14 08:44:45 +00:00 |
l10n daemon script
|
2c78ff8bfd
|
SVN_SILENT made messages (.desktop file)
|
2014-07-25 10:15:29 +00:00 |
l10n daemon script
|
5179d4d3c9
|
SVN_SILENT made messages (.desktop file)
|
2014-07-16 09:40:44 +00:00 |
l10n daemon script
|
ae9689a105
|
SVN_SILENT made messages (.desktop file)
|
2014-07-14 03:49:40 +00:00 |