Laurent Montel
|
500feda997
|
Fix forward declaration
|
7 years ago |
l10n daemon script
|
45388fa383
|
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
|
5b63edb807
|
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
|
9ffafd2c15
|
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
|
4434af7725
|
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
|
5d6410de38
|
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
|
0d1c0e8b9e
|
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
|
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
|
d2737d2b55
|
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 |
Yuri Chornoivan
|
ea415539fc
|
Fix minor EBN issues
|
8 years ago |
|
l10n daemon script
|
10f733a6ae
|
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
|
e64779e0ba
|
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
|
6298005f74
|
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
|
29dc4f4f39
|
Remove usage of dead QT_USE_FAST_CONCATENATION
Dropped pre-Qt5
|
8 years ago |
|
l10n daemon script
|
6816ccdb48
|
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
|
887d225c17
|
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
|
4332eceebf
|
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
|
ba1cb7bc80
|
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
|
4d2179ae95
|
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 |
|
l10n daemon script
|
839a727b70
|
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 |
|
Friedrich W. H. Kossebau
|
6e1946cec7
|
Remove module prefix from Qt includes
|
8 years ago |
|
Laurent Montel
|
31421a6e5f
|
Use nullptr
|
8 years ago |
|
l10n daemon script
|
d389cde75f
|
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
|
6ea0292868
|
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
|
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
|
cd61d9b1df
|
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
|
e8e35bedf4
|
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 |
Luigi Toscano
|
039bff026c
|
Rename the translation catalog (avoid conflicts)
Avoid the conflict with their still-shipped counterparts from
kdelibs and kde-runtime.
|
9 years ago |
|
l10n daemon script
|
49d79637c5
|
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
|
f1167336c1
|
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
|
60eb1564da
|
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
|
a465ca396d
|
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
|
3949d990a4
|
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
|
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
|
d0a211005d
|
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
|
757f30c92d
|
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
|
eed497cef4
|
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
|
73f5302679
|
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 |
Andreas Sturmlechner
|
829fb30934
|
[phonon] Do not set RPATH
REVIEW: 126210
|
10 years ago |
Aleix Pol
|
96ff1c868e
|
Properly define overrides as suggested by the c++ standard
|
10 years ago |
Michael Palimaka
|
cc2b33dcdb
|
Remove old CMake cruft.
REVIEW: 120566
|
10 years ago |
|
l10n daemon script
|
5435e568df
|
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
|
278ba70509
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
|
l10n daemon script
|
b2173723ce
|
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
|
10856b8411
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
