l10n daemon script
2ff927b38a
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"
6 years ago
l10n daemon script
fe6768be4b
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"
6 years ago
l10n daemon script
909f9145e7
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"
6 years ago
l10n daemon script
fc5bff8db6
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
4dfc454d51
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
92a6d3f3a3
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
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
Friedrich W. H. Kossebau
1894d888f7
Remove unused entry X-KDE-DBus-ModuleName from kded plugins' metadata
...
That entry has never been used, instead the plugin id (as by
KPluginMetaData::pluginId()) has been used for the module name in the
D-Bus object path.
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
d5a7ad93fb
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
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
Ragnar Thomsen
498cd08a19
Port KDED plugins to json metadata
...
Port all remaining KDED modules to json metadata and disables
installation of the desktop files.
The plugins now get installed in ${KDE_INSTALL_PLUGINDIR}/kf5/kded and
the "kded_" prefix is removed.
REVIEW: 124845
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
8e3c188f58
SVN_SILENT made messages (.desktop file)
11 years ago
l10n daemon script
99bd87a5ad
SVN_SILENT made messages (.desktop file)
11 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
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
l10n daemon script
a80ea24203
SVN_SILENT made messages (.desktop file)
12 years ago
l10n daemon script
de65f94f1d
SVN_SILENT made messages (.desktop file)
12 years ago
Aleix Pol
da27b27678
Initial import from the monolithic kde-workspace.
...
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
techbase wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://community.kde.org/Frameworks/GitOldHistory
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo kde-workspace, frameworks branch, at commit
049113e719dd2fc4446d054fa1a3aada330094f0
12 years ago