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
|
3908c521ca
|
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-13 10:35:10 +00:00 |
|
l10n daemon script
|
a1feac929b
|
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-16 09:05:14 +00:00 |
|
l10n daemon script
|
9d96277a5e
|
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-09 09:05:50 +00:00 |
|
l10n daemon script
|
3c90a5d835
|
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-07 10:15:57 +00:00 |
|
l10n daemon script
|
8d9fd0846a
|
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-06 09:14:26 +00:00 |
|
l10n daemon script
|
26ca3e43b2
|
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-05 09:08:31 +00:00 |
|
l10n daemon script
|
67a6976f8c
|
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-03 09:40:56 +00:00 |
|
l10n daemon script
|
faca537924
|
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-02 08:47:47 +00:00 |
|
l10n daemon script
|
06be5c64f7
|
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-01 10:29:52 +00:00 |
|
Marco Martin
|
46789eb1c8
|
add a couple of plasmoid templates for kapptemplate/kdevelop
this makes easier to develop a new plasmoid,
there are two templates:
one is for a pure QML plasmoid
the othe rone has a C++ part
|
2015-11-30 15:02:43 +01:00 |
|