l10n daemon script
|
703f837f6b
|
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"
|
7 years ago |
|
l10n daemon script
|
948d5e7814
|
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"
|
8 years ago |
|
l10n daemon script
|
cb563f7af0
|
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"
|
8 years ago |
|
l10n daemon script
|
47d5fe1665
|
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"
|
8 years ago |
|
l10n daemon script
|
4971f6dc5a
|
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"
|
8 years ago |
|
l10n daemon script
|
263c3e0d62
|
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"
|
8 years ago |
|
l10n daemon script
|
7c9099da1e
|
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"
|
8 years ago |
|
l10n daemon script
|
bfc86f245f
|
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"
|
8 years ago |
|
l10n daemon script
|
9409382219
|
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"
|
8 years ago |
Friedrich W. H. Kossebau
|
2608ccce81
|
Use nullptr
|
8 years ago |
|
l10n daemon script
|
05fe32a90d
|
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"
|
8 years ago |
|
Friedrich W. H. Kossebau
|
6e1946cec7
|
Remove module prefix from Qt includes
|
8 years ago |
|
l10n daemon script
|
15df7f02c0
|
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"
|
8 years ago |
|
l10n daemon script
|
5a540fe5af
|
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"
|
8 years ago |
|
l10n daemon script
|
a93e47f3d0
|
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"
|
8 years ago |
|
l10n daemon script
|
50b7c832f3
|
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"
|
9 years ago |
|
l10n daemon script
|
98dfa49bdf
|
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"
|
9 years ago |
|
l10n daemon script
|
b1c38888db
|
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"
|
9 years ago |
Aleix Pol
|
96ff1c868e
|
Properly define overrides as suggested by the c++ standard
|
10 years ago |
Daniel Faust
|
8bedfde289
|
Places data engine: Rename model role "index" to "placeIndex"
This way the index of a ListView item won't be overwritten in a qml application.
REVIEW: 126851
|
10 years ago |
|
l10n daemon script
|
36b2d40cae
|
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"
|
10 years ago |
|
l10n daemon script
|
8180c50abd
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
|
l10n daemon script
|
3973041666
|
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"
|
10 years ago |
|
l10n daemon script
|
0e35c812b0
|
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"
|
10 years ago |
Montel Laurent
|
a007f294b4
|
Use new connect api + QStringLiteral
|
11 years ago |
|
l10n daemon script
|
6184a953b1
|
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"
|
11 years ago |
|
l10n daemon script
|
80c1c7eada
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
d3277e8269
|
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"
|
11 years ago |
|
l10n daemon script
|
738b59196a
|
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"
|
11 years ago |
|
l10n daemon script
|
fb88c728e1
|
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"
|
11 years ago |
|
Montel Laurent
|
5f9ae5e13c
|
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
|
11 years ago |
|
l10n daemon script
|
2569d35ff4
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
|
l10n daemon script
|
5e058803f7
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
David Edmundson
|
d03b205276
|
kservice_desktop_to_json -> kcoreaddons_desktop_to_json
|
11 years ago |
|
Montel Laurent
|
ed441f0bc3
|
Remove not necessary include moc
|
12 years ago |
|
l10n daemon script
|
359949619e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
6ef6c7e692
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
cf13f672b0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
f6fa9c9cd7
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
7340ee7972
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
02b92c46d5
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
55744e1106
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
Aleix Pol
|
bb43827e62
|
Revert "Port dataengines to PLASMA_DATA_INSTALL_DIR"
This reverts commit 73736e80ea.
DataEngines are actual plugins to plasma-framework, so the change
is not correct. Otherwise they end up in /share
|
12 years ago |
|
Aleix Pol
|
73736e80ea
|
Port dataengines to PLASMA_DATA_INSTALL_DIR
|
12 years ago |
|
l10n daemon script
|
bc51c4f2b0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
c12cad775c
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
8356528abc
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
0054ac7f20
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
Aleix Pol
|
d596a1b270
|
Adapt to changes in plasma-framework
|
12 years ago |
|
l10n daemon script
|
a80ea24203
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
